Fix bug: Sometimes we may miss WAL segments and threads

Author: za-arthur

src/parsexlog.c

@@ -305,6 +305,8 @@ extractPageMap(const char *archivedir, XLogRecPtr startpoint, TimeLineID tli,
 		/* By default there is some error */
 		thread_args[i].ret = 1;
 
+		threads_need++;
+
 		/* Adjust startpoint to the next thread */
 		if (nextSegNoToRead == 0)
 			XLByteToSeg(startpoint, nextSegNoToRead);
@@ -317,10 +319,6 @@ extractPageMap(const char *archivedir, XLogRecPtr startpoint, TimeLineID tli,
 		if (nextSegNoToRead > endSegNo)
 			break;
 		XLogSegNoOffsetToRecPtr(nextSegNoToRead, 0, startpoint);
-		/* Skip over the page header */
-		startpoint += SizeOfXLogLongPHD;
-
-		threads_need++;
 	}
 
 	/* Run threads */

tests/page.py

@@ -255,11 +255,6 @@ def test_page_archive(self):
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
 
-        # GET RESTORED PGDATA AND COMPARE
-        if self.paranoia:
-            pgdata_restored = self.pgdata_content(node.data_dir)
-            self.compare_pgdata(pgdata, pgdata_restored)
-
         node.slow_start()
 
         full_result_new = node.execute("postgres", "SELECT * FROM t_heap")
@@ -278,6 +273,12 @@ def test_page_archive(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
+
+         # GET RESTORED PGDATA AND COMPARE
+        if self.paranoia:
+            pgdata_restored = self.pgdata_content(node.data_dir)
+            self.compare_pgdata(pgdata, pgdata_restored)
+
         node.slow_start()
 
         page_result_new = node.execute("postgres", "SELECT * FROM t_heap")