bugfix: fix incorrect pg_control reading (as per comment by Roman Zharkov)

Author: kulaginm

src/catchup.c

@@ -211,9 +211,9 @@ catchup_preflight_checks(PGNodeInfo *source_node_info, PGconn *source_conn,
 	{
 		char	backup_label_filename[MAXPGPATH];
 
-		join_path_components(backup_label_filename, dest_pgdata, "backup_label");
+		join_path_components(backup_label_filename, dest_pgdata, PG_BACKUP_LABEL_FILE);
 		if (fio_access(backup_label_filename, F_OK, FIO_LOCAL_HOST) == 0)
-			elog(ERROR, "Destination directory contains \"backup_label\" file");
+			elog(ERROR, "Destination directory contains \"" PG_BACKUP_LABEL_FILE "\" file");
 	}
 
 	if (current.from_replica && exclusive_backup)
@@ -414,7 +414,7 @@ do_catchup_instance(const char *source_pgdata, const char *dest_pgdata, PGconn *
 			true, true, false, backup_logs, true, 0, FIO_LOCAL_HOST);
 
 		// fill dest_redo.lsn and dest_redo.tli
-		get_redo(dest_pgdata, &dest_redo);
+		get_redo(dest_pgdata, FIO_LOCAL_HOST, &dest_redo);
 		elog(INFO, "syncLSN = %X/%X", (uint32) (dest_redo.lsn >> 32), (uint32) dest_redo.lsn);
 	}
 

src/pg_probackup.h

@@ -1177,7 +1177,7 @@ extern uint64 get_remote_system_identifier(PGconn *conn);
 extern uint32 get_data_checksum_version(bool safe);
 extern pg_crc32c get_pgcontrol_checksum(const char *pgdata_path);
 extern uint32 get_xlog_seg_size(const char *pgdata_path);
-extern void get_redo(const char *pgdata_path, RedoParams *redo);
+extern void get_redo(const char *pgdata_path, fio_location pgdata_location, RedoParams *redo);
 extern void set_min_recovery_point(pgFile *file, const char *backup_path,
 								   XLogRecPtr stop_backup_lsn);
 extern void copy_pgcontrol_file(const char *from_fullpath, fio_location from_location,

src/restore.c

@@ -485,7 +485,7 @@ do_restore_or_validate(InstanceState *instanceState, time_t target_backup_id, pg
 	{
 		RedoParams redo;
 		parray	  *timelines = NULL;
-		get_redo(instance_config.pgdata, &redo);
+		get_redo(instance_config.pgdata, FIO_DB_HOST, &redo);
 
 		if (redo.checksum_version == 0)
 			elog(ERROR, "Incremental restore in 'lsn' mode require "

src/util.c

@@ -352,14 +352,14 @@ get_pgcontrol_checksum(const char *pgdata_path)
 }
 
 void
-get_redo(const char *pgdata_path, RedoParams *redo)
+get_redo(const char *pgdata_path, fio_location pgdata_location, RedoParams *redo)
 {
 	ControlFileData ControlFile;
 	char	   *buffer;
 	size_t		size;
 
 	/* First fetch file... */
-	buffer = slurpFile(pgdata_path, XLOG_CONTROL_FILE, &size, false, FIO_DB_HOST);
+	buffer = slurpFile(pgdata_path, XLOG_CONTROL_FILE, &size, false, pgdata_location);
 
 	digestControlFile(&ControlFile, buffer, size);
 	pg_free(buffer);