[PGPRO-5421] fix for test test_archive_push_sanity

src/backup.c

@@ -943,7 +943,7 @@ check_system_identifiers(PGconn *conn, const char *pgdata)
 	uint64		system_id_conn;
 	uint64		system_id_pgdata;
 
-	system_id_pgdata = get_system_identifier(pgdata, FIO_DB_HOST);
+	system_id_pgdata = get_system_identifier(pgdata, FIO_DB_HOST, false);
 	system_id_conn = get_remote_system_identifier(conn);
 
 	/* for checkdb check only system_id_pgdata and system_id_conn */

src/catchup.c

@@ -48,7 +48,7 @@ catchup_init_state(PGNodeInfo	*source_node_info, const char *source_pgdata, cons
 
 	/* Get WAL segments size and system ID of source PG instance */
 	instance_config.xlog_seg_size = get_xlog_seg_size(source_pgdata);
-	instance_config.system_identifier = get_system_identifier(source_pgdata, FIO_DB_HOST);
+	instance_config.system_identifier = get_system_identifier(source_pgdata, FIO_DB_HOST, false);
 	current.start_time = time(NULL);
 
 	strlcpy(current.program_version, PROGRAM_VERSION, sizeof(current.program_version));
@@ -163,15 +163,15 @@ catchup_preflight_checks(PGNodeInfo *source_node_info, PGconn *source_conn,
 		uint64	source_conn_id, source_id, dest_id;
 
 		source_conn_id = get_remote_system_identifier(source_conn);
-		source_id = get_system_identifier(source_pgdata, FIO_DB_HOST); /* same as instance_config.system_identifier */
+		source_id = get_system_identifier(source_pgdata, FIO_DB_HOST, false); /* same as instance_config.system_identifier */
 
 		if (source_conn_id != source_id)
 			elog(ERROR, "Database identifiers mismatch: we connected to DB id %lu, but in \"%s\" we found id %lu",
 				source_conn_id, source_pgdata, source_id);
 
 		if (current.backup_mode != BACKUP_MODE_FULL)
 		{
-			dest_id = get_system_identifier(dest_pgdata, FIO_LOCAL_HOST);
+			dest_id = get_system_identifier(dest_pgdata, FIO_LOCAL_HOST, false);
 			if (source_conn_id != dest_id)
 			elog(ERROR, "Database identifiers mismatch: we connected to DB id %lu, but in \"%s\" we found id %lu",
 				source_conn_id, dest_pgdata, dest_id);

src/init.c

@@ -57,7 +57,7 @@ do_add_instance(InstanceState *instanceState, InstanceConfig *instance)
 						 "(-D, --pgdata)");
 
 	/* Read system_identifier from PGDATA */
-	instance->system_identifier = get_system_identifier(instance->pgdata, FIO_DB_HOST);
+	instance->system_identifier = get_system_identifier(instance->pgdata, FIO_DB_HOST, false);
 	/* Starting from PostgreSQL 11 read WAL segment size from PGDATA */
 	instance->xlog_seg_size = get_xlog_seg_size(instance->pgdata);
 

src/pg_probackup.c

@@ -801,17 +801,21 @@ main(int argc, char *argv[])
 	{
 		/* Check archive-push parameters and construct archive_push_xlog_dir
 		 *
-		 * There are 3 cases:
+		 * There are 4 cases:
 		 * 1. no --wal-file-path specified -- use cwd, ./PG_XLOG_DIR for wal files
 		 * (and ./PG_XLOG_DIR/archive_status for .done files inside do_archive_push())
 		 * in this case we can use batches and threads
 		 * 2. --wal-file-path is specified and it is the same dir as stored in pg_probackup.conf (instance_config.pgdata)
 		 * in this case we can use this path, as well as batches and thread
-		 * 3. --wal-file-path is specified and it is different from instance_config.pgdata
+		 * 3. --wal-file-path is specified and it isn't same dir as stored in pg_probackup.conf but control file present with correct system_id
+		 * in this case we can use this path, as well as batches and thread
+		 * (replica for example, see test_archive_push_sanity)
+		 * 4. --wal-file-path is specified and it is different from instance_config.pgdata and no control file found
 		 * disable optimizations and work with user specified path
 		 */
 		bool	check_system_id = true;
 		uint64	system_id;
+		char	current_dir[MAXPGPATH];
 
 		if (wal_file_name == NULL)
 			elog(ERROR, "Required parameter is not specified: --wal-file-name %%f");
@@ -823,14 +827,13 @@ main(int argc, char *argv[])
 		if (instance_config.compress_alg == PGLZ_COMPRESS)
                         elog(ERROR, "Cannot use pglz for WAL compression");
 
+		if (!getcwd(current_dir, sizeof(current_dir)))
+			elog(ERROR, "getcwd() error");
+
 		if (wal_file_path == NULL)
 		{
 			/* 1st case */
-			char	current_dir[MAXPGPATH];
-			if (!getcwd(current_dir, sizeof(current_dir)))
-				elog(ERROR, "getcwd() error");
-
-			system_id = get_system_identifier(current_dir, FIO_DB_HOST);
+			system_id = get_system_identifier(current_dir, FIO_DB_HOST, false);
 			join_path_components(archive_push_xlog_dir, current_dir, XLOGDIR);
 		}
 		else
@@ -849,24 +852,31 @@ main(int argc, char *argv[])
 			if (fio_is_same_file(stripped_wal_file_path, archive_push_xlog_dir, true, FIO_DB_HOST))
 			{
 				/* 2nd case */
-				system_id = get_system_identifier(instance_config.pgdata, FIO_DB_HOST);
+				system_id = get_system_identifier(instance_config.pgdata, FIO_DB_HOST, false);
 				/* archive_push_xlog_dir already have right value */
 			}
 			else
 			{
-				/* 3rd case */
-				check_system_id = false;
 				if (strlen(stripped_wal_file_path) < MAXPGPATH)
 					strncpy(archive_push_xlog_dir, stripped_wal_file_path, MAXPGPATH);
 				else
 					elog(ERROR, "Value specified to --wal_file_path is too long");
 
-				if (batch_size > 1 || num_threads > 1 || !no_ready_rename)
+				system_id = get_system_identifier(current_dir, FIO_DB_HOST, true);
+				/* 3rd case if control file present -- i.e. system_id != 0 */
+
+				if (system_id == 0)
 				{
-					elog(WARNING, "Supplied --wal_file_path is outside pgdata, force safe values for options: --batch-size=1 -j 1 --no-ready-rename");
-					batch_size = 1;
-					num_threads = 1;
-					no_ready_rename = true;
+					/* 4th case */
+					check_system_id = false;
+
+					if (batch_size > 1 || num_threads > 1 || !no_ready_rename)
+					{
+						elog(WARNING, "Supplied --wal_file_path is outside pgdata, force safe values for options: --batch-size=1 -j 1 --no-ready-rename");
+						batch_size = 1;
+						num_threads = 1;
+						no_ready_rename = true;
+					}
 				}
 			}
 			pfree(stripped_wal_file_path);

src/pg_probackup.h

@@ -1153,7 +1153,7 @@ extern XLogRecPtr get_next_record_lsn(const char *archivedir, XLogSegNo	segno, T
 extern TimeLineID get_current_timeline(PGconn *conn);
 extern TimeLineID get_current_timeline_from_control(const char *pgdata_path, fio_location location, bool safe);
 extern XLogRecPtr get_checkpoint_location(PGconn *conn);
-extern uint64 get_system_identifier(const char *pgdata_path, fio_location location);
+extern uint64 get_system_identifier(const char *pgdata_path, fio_location location, bool safe);
 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);

src/restore.c

@@ -2186,7 +2186,7 @@ check_incremental_compatibility(const char *pgdata, uint64 system_identifier,
 	 */
 	elog(INFO, "Trying to read pg_control file in destination directory");
 
-	system_id_pgdata = get_system_identifier(pgdata, FIO_DB_HOST);
+	system_id_pgdata = get_system_identifier(pgdata, FIO_DB_HOST, false);
 
 	if (system_id_pgdata == instance_config.system_identifier)
 		system_id_match = true;

src/util.c

@@ -247,15 +247,15 @@ get_checkpoint_location(PGconn *conn)
 }
 
 uint64
-get_system_identifier(const char *pgdata_path, fio_location location)
+get_system_identifier(const char *pgdata_path, fio_location location, bool safe)
 {
 	ControlFileData ControlFile;
 	char	   *buffer;
 	size_t		size;
 
 	/* First fetch file... */
-	buffer = slurpFile(pgdata_path, XLOG_CONTROL_FILE, &size, false, location);
-	if (buffer == NULL)
+	buffer = slurpFile(pgdata_path, XLOG_CONTROL_FILE, &size, safe, location);
+	if (safe && buffer == NULL)
 		return 0;
 	digestControlFile(&ControlFile, buffer, size);
 	pg_free(buffer);