[PBCKP-270] Updated wait_wal_lsn function for begin backup without wal file for streaming WAL.

VictorSpirin · funny-falcon · commit 71e6895935d1 · 2022-12-23T13:34:06.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -1327,6 +1327,16 @@ wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr target_lsn, bool is_start_l
 			}
 			else
 				elog(LOG, "Found WAL segment: %s", wal_segment_path);
+
+
+			/* Check current file for stream. It may be not exist in S3 */
+			if (!file_exists && segment_only && is_start_lsn && in_stream_dir && try_count > 1)
+			{
+				if( isStreamProccessed(wal_segment))
+					return InvalidXLogRecPtr;
+
+			}
+
 		}
 
 		if (file_exists)
diff --git a/src/compatibility/receivelog.c b/src/compatibility/receivelog.c
@@ -1222,3 +1222,9 @@ CalculateCopyStreamSleeptime(TimestampTz now, int standby_message_timeout,
 
 	return sleeptime;
 }
+
+
+bool isStreamProccessed(char *seg_filename)
+{
+	return still_sending && !strcmp(current_walfile_name, seg_filename);
+}
diff --git a/src/compatibility/walmethods.h b/src/compatibility/walmethods.h
@@ -85,6 +85,7 @@ struct WalWriteMethod
 
 	/* Return a text for the last error in this Walfile */
 	const char *(*getlasterror) (void);
+
 };
 
 /*
diff --git a/src/pg_probackup.h b/src/pg_probackup.h
@@ -1221,6 +1221,7 @@ extern XLogRecPtr wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr lsn, bool
 extern void wait_wal_and_calculate_stop_lsn(const char *xlog_path, XLogRecPtr stop_lsn, pgBackup *backup);
 extern int64 calculate_datasize_of_filelist(parray *filelist);
 
+extern bool isStreamProccessed(char *seg_filename); /* Checks, that this file is stream processing. File name without path. */
 
 /*
  * Slices and arrays for C strings

Original file line number	Diff line number	Diff line change
`@@ -1222,3 +1222,9 @@ CalculateCopyStreamSleeptime(TimestampTz now, int standby_message_timeout,`
`1222`	`1222`
`1223`	`1223`	`return sleeptime;`
`1224`	`1224`	`}`
	`1225`	`+`
	`1226`	`+`
	`1227`	`+bool isStreamProccessed(char *seg_filename)`
	`1228`	`+{`
	`1229`	`+ return still_sending && !strcmp(current_walfile_name, seg_filename);`
	`1230`	`+}`