Fix WAL validate messages

Artur Zakirov · Artur Zakirov · commit c2410fc72bf9 · 2017-02-17T15:37:44.000+03:00
diff --git a/parsexlog.c b/parsexlog.c
@@ -164,12 +164,12 @@ validate_wal(pgBackup *backup,
 			all_wal = true;
 			break;
 		}
-		/* Stop if there are no target xid and target time */
+		/* If there are no target xid and target time */
 		else if (!TransactionIdIsValid(target_xid) && target_time == 0 &&
 			xlogreader->ReadRecPtr == backup->stop_lsn)
 		{
 			all_wal = true;
-			break;
+			/* We don't stop here. We want to get last_xid and last_time */
 		}
 
 		startpoint = InvalidXLogRecPtr; /* continue reading at next record */
@@ -217,13 +217,13 @@ validate_wal(pgBackup *backup,
 				 last_timestamp, last_xid);
 
 			if (TransactionIdIsValid(target_xid) && target_time != 0)
-				elog(ERROR, "there are not WAL records to time %s and xid " XID_FMT,
+				elog(ERROR, "there are no WAL records to time %s and xid " XID_FMT,
 					 target_timestamp, target_xid);
 			else if (TransactionIdIsValid(target_xid))
-				elog(ERROR, "there are not WAL records to xid " XID_FMT,
+				elog(ERROR, "there are no WAL records to xid " XID_FMT,
 					 target_xid);
 			else if (target_time != 0)
-				elog(ERROR, "there are not WAL records to time %s ",
+				elog(ERROR, "there are no WAL records to time %s ",
 					 target_timestamp);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -164,12 +164,12 @@ validate_wal(pgBackup *backup,`
`164`	`164`	`all_wal = true;`
`165`	`165`	`break;`
`166`	`166`	`}`
`167`		`- /* Stop if there are no target xid and target time */`
	`167`	`+ /* If there are no target xid and target time */`
`168`	`168`	`else if (!TransactionIdIsValid(target_xid) && target_time == 0 &&`
`169`	`169`	`xlogreader->ReadRecPtr == backup->stop_lsn)`
`170`	`170`	`{`
`171`	`171`	`all_wal = true;`
`172`		`- break;`
	`172`	`+ /* We don't stop here. We want to get last_xid and last_time */`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`startpoint = InvalidXLogRecPtr; /* continue reading at next record */`
`@@ -217,13 +217,13 @@ validate_wal(pgBackup *backup,`
`217`	`217`	`last_timestamp, last_xid);`
`218`	`218`
`219`	`219`	`if (TransactionIdIsValid(target_xid) && target_time != 0)`
`220`		`- elog(ERROR, "there are not WAL records to time %s and xid " XID_FMT,`
	`220`	`+ elog(ERROR, "there are no WAL records to time %s and xid " XID_FMT,`
`221`	`221`	`target_timestamp, target_xid);`
`222`	`222`	`else if (TransactionIdIsValid(target_xid))`
`223`		`- elog(ERROR, "there are not WAL records to xid " XID_FMT,`
	`223`	`+ elog(ERROR, "there are no WAL records to xid " XID_FMT,`
`224`	`224`	`target_xid);`
`225`	`225`	`else if (target_time != 0)`
`226`		`- elog(ERROR, "there are not WAL records to time %s ",`
	`226`	`+ elog(ERROR, "there are no WAL records to time %s ",`
`227`	`227`	`target_timestamp);`
`228`	`228`	`}`
`229`	`229`	`}`