minor fix to do_retention_purge

gsmolk · gsmolk · commit 0a87d4984035 · 2018-01-24T04:50:32.000+03:00
diff --git a/src/delete.c b/src/delete.c
@@ -207,8 +207,8 @@ do_retention_purge(void)
 	}
 
 	/*
-	 * If oldest_lsn wasn`t set in prevous step
-	 * get oldest backup LSN and TLI for WAL purging
+	 * If oldest_lsn and oldest_tli weren`t set because previous step was skipped
+	 * then set them now if we are going to purge WAL
 	 */
 	if (delete_wal && (XLogRecPtrIsInvalid(oldest_lsn)))
 	{
@@ -217,6 +217,11 @@ do_retention_purge(void)
 		oldest_tli = backup->tli;
 	}
 
+	/* Be paranoid */
+	if (XLogRecPtrIsInvalid(oldest_lsn))
+		elog(ERROR, "Not going to purge WAL because backup %s has invalid LSN",
+			base36enc(backup->start_time));
+
 	/* Purge WAL files */
 	if (delete_wal)
 	{

Original file line number	Diff line number	Diff line change
`@@ -207,8 +207,8 @@ do_retention_purge(void)`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`/*`
`210`		- * If oldest_lsn wasn`t set in prevous step
`211`		`- * get oldest backup LSN and TLI for WAL purging`
	`210`	+ * If oldest_lsn and oldest_tli weren`t set because previous step was skipped
	`211`	`+ * then set them now if we are going to purge WAL`
`212`	`212`	`*/`
`213`	`213`	`if (delete_wal && (XLogRecPtrIsInvalid(oldest_lsn)))`
`214`	`214`	`{`
`@@ -217,6 +217,11 @@ do_retention_purge(void)`
`217`	`217`	`oldest_tli = backup->tli;`
`218`	`218`	`}`
`219`	`219`
	`220`	`+ /* Be paranoid */`
	`221`	`+ if (XLogRecPtrIsInvalid(oldest_lsn))`
	`222`	`+ elog(ERROR, "Not going to purge WAL because backup %s has invalid LSN",`
	`223`	`+ base36enc(backup->start_time));`
	`224`	`+`
`220`	`225`	`/* Purge WAL files */`
`221`	`226`	`if (delete_wal)`
`222`	`227`	`{`