Merge branch 'master' into release_2_4

Author: gsmolk

src/data.c

@@ -353,17 +353,6 @@ prepare_page(ConnectionArgs *conn_arg,
 						Assert(false);
 				}
 			}
-
-			/*
-			 * If ptrack support is available, use it to get invalid block
-			 * instead of rereading it 99 times
-			 */
-			if (!page_is_valid && strict && ptrack_version_num > 0)
-			{
-				elog(WARNING, "File \"%s\", block %u, try to fetch via shared buffer",
-					from_fullpath, blknum);
-				break;
-			}
 		}
 
 		/*
@@ -385,7 +374,7 @@ prepare_page(ConnectionArgs *conn_arg,
 			/* Error out in case of merge or backup without ptrack support;
 			 * issue warning in case of checkdb or backup with ptrack support
 			 */
-			if (!strict || (strict && ptrack_version_num > 0))
+			if (!strict)
 				elevel = WARNING;
 
 			if (errormsg)
@@ -396,16 +385,12 @@ prepare_page(ConnectionArgs *conn_arg,
 								from_fullpath, blknum);
 
 			pg_free(errormsg);
+			return PageIsCorrupted;
 		}
 
 		/* Checkdb not going futher */
 		if (!strict)
-		{
-			if (page_is_valid)
-				return PageIsOk;
-			else
-				return PageIsCorrupted;
-		}
+			return PageIsOk;
 	}
 
 	/*

src/parsexlog.c

@@ -691,7 +691,8 @@ get_next_record_lsn(const char *archivedir, XLogSegNo	segno,
 {
 	XLogReaderState *xlogreader;
 	XLogReaderData   reader_data;
-	XLogRecPtr       startpoint, found, res;
+	XLogRecPtr       startpoint, found;
+	XLogRecPtr       res = InvalidXLogRecPtr;
 	char             wal_segment[MAXFNAMELEN];
 	int              attempts = 0;
 

src/restore.c

@@ -100,7 +100,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
 {
 	int			i = 0;
 	int			j = 0;
-	parray	   *backups;
+	parray	   *backups = NULL;
 	pgBackup   *tmp_backup = NULL;
 	pgBackup   *current_backup = NULL;
 	pgBackup   *dest_backup = NULL;
@@ -476,13 +476,14 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
 	/* ssh connection to longer needed */
 	fio_disconnect();
 
+	elog(INFO, "%s of backup %s completed.",
+		 action, base36enc(dest_backup->start_time));
+
 	/* cleanup */
 	parray_walk(backups, pgBackupFree);
 	parray_free(backups);
 	parray_free(parent_chain);
 
-	elog(INFO, "%s of backup %s completed.",
-		 action, base36enc(dest_backup->start_time));
 	return 0;
 }