minor fix

gsmolk · gsmolk · commit 3f2e29d2a48f · 2021-11-08T00:08:41.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -1237,17 +1237,12 @@ wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr target_lsn, bool is_start_l
 			 int timeout_elevel, bool in_stream_dir)
 {
 	XLogSegNo	targetSegNo;
-	char		wal_segment_path[MAXPGPATH],
-//				wal_segment_subdir[MAXPGPATH], // used only to check file existence, not actual parsing
+	char		wal_segment_path[MAXPGPATH], /* used only for reporting */
 				wal_segment[MAXFNAMELEN];
 	uint32		try_count = 0,
 				timeout;
 	char		*wal_delivery_str = in_stream_dir ? "streamed":"archived";
 
-//#ifdef HAVE_LIBZ
-//	char		gz_wal_segment_path[MAXPGPATH];
-//#endif
-
 	/* Compute the name of the WAL file containing requested LSN */
 	GetXLogSegNo(target_lsn, targetSegNo, instance_config.xlog_seg_size);
 	if (in_prev_segment)
@@ -1256,12 +1251,15 @@ wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr target_lsn, bool is_start_l
 					instance_config.xlog_seg_size);
 
 	// obtain WAL archive subdir for ARCHIVE backup
-//	if (in_stream_dir)
-//		strcpy(wal_segment_subdir, wal_segment_dir);
-//	else
-//		get_archive_subdir(wal_segment_subdir, wal_segment_dir, wal_segment, SEGMENT);
-//
-//	join_path_components(wal_segment_path, wal_segment_subdir, wal_segment);
+	if (in_stream_dir)
+		join_path_components(wal_segment_path, wal_segment_dir, wal_segment);
+	else
+	{
+		char wal_segment_subdir[MAXPGPATH];
+		get_archive_subdir(wal_segment_subdir, wal_segment_dir, wal_segment, SEGMENT);
+		join_path_components(wal_segment_path, wal_segment_subdir, wal_segment);
+	}
+
 	/*
 	 * In pg_start_backup we wait for 'target_lsn' in 'pg_wal' directory if it is
 	 * stream and non-page backup. Page backup needs archived WAL files, so we
@@ -1282,11 +1280,6 @@ wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr target_lsn, bool is_start_l
 		elog(LOG, "Looking for LSN %X/%X in segment: %s",
 			 (uint32) (target_lsn >> 32), (uint32) target_lsn, wal_segment);
 
-//#ifdef HAVE_LIBZ
-//	snprintf(gz_wal_segment_path, sizeof(gz_wal_segment_path), "%s.gz",
-//			 wal_segment_path);
-//#endif
-
 	/* Wait until target LSN is archived or streamed */
 	while (true)
 	{
diff --git a/src/parsexlog.c b/src/parsexlog.c
@@ -2051,7 +2051,8 @@ static XLogReaderState* WalReaderAllocate(uint32 wal_seg_size, XLogReaderData *r
 
 /*
  * Is WAL file exists in archive directory
- * first check subdirectory, then fallback to archive directory
+ * for stream backup check uncompressed segment in wal_root_dir
+ * for archive backup first check subdirectory, then fallback to archive directory
  */
 bool IsWalFileExists(const char *wal_segment_name, const char *wal_root_dir, bool in_stream_dir)
 {
@@ -2098,11 +2099,11 @@ bool IsWalFileExists(const char *wal_segment_name, const char *wal_root_dir, boo
 	goto not_found;
 
 found_compressed_file:
-	elog(LOG, "Found WAL segment: %s", wal_file_fullpath);
+	elog(LOG, "Found compressed WAL segment: %s", wal_file_fullpath);
 	return true;
 
 found_uncompressed_file:
-	elog(LOG, "Found compressed WAL segment: %s", wal_file_fullpath_gz);
+	elog(LOG, "Found WAL segment: %s", wal_file_fullpath_gz);
 	return true;
 
 not_found:
