bugfix: correctly append streamed segments to backup filelist

Author: gsmolk

src/pg_probackup.h

@@ -649,6 +649,9 @@ typedef struct BackupPageHeader2
 	 strcmp((fname) + XLOG_FNAME_LEN, ".gz") == 0)
 
 #if PG_VERSION_NUM >= 110000
+
+#define WalSegmentOffset(xlogptr, wal_segsz_bytes) \
+	XLogSegmentOffset(xlogptr, wal_segsz_bytes)
 #define GetXLogSegNo(xlrp, logSegNo, wal_segsz_bytes) \
 	XLByteToSeg(xlrp, logSegNo, wal_segsz_bytes)
 #define GetXLogRecPtr(segno, offset, wal_segsz_bytes, dest) \
@@ -668,6 +671,8 @@ typedef struct BackupPageHeader2
 #define GetXLogFromFileName(fname, tli, logSegNo, wal_segsz_bytes) \
 		XLogFromFileName(fname, tli, logSegNo, wal_segsz_bytes)
 #else
+#define WalSegmentOffset(xlogptr, wal_segsz_bytes) \
+	XLogSegmentOffset(xlogptr)
 #define GetXLogSegNo(xlrp, logSegNo, wal_segsz_bytes) \
 	XLByteToSeg(xlrp, logSegNo)
 #define GetXLogRecPtr(segno, offset, wal_segsz_bytes, dest) \

src/stream.c

@@ -290,8 +290,13 @@ stop_streaming(XLogRecPtr xlogpos, uint32 timeline, bool segment_finished)
 
         GetXLogSegNo(xlogpos, xlog_segno, instance_config.xlog_seg_size);
 
-        /* xlogpos points to the current segment, and we need the finished - previous one */
-        xlog_segno--;
+        /*
+		 * xlogpos points to the current segment, and we need the finished - previous one
+		 * inless xlogpos points to not 0 offset in segment
+		 */
+		if (WalSegmentOffset(xlogpos, instance_config.xlog_seg_size) == 0)
+			xlog_segno--;
+
         GetXLogFileName(wal_segment_name, timeline, xlog_segno,
                         instance_config.xlog_seg_size);