Fix old backup removal for specified number of days

Michael Paquier · Michael Paquier · commit 1c3512fadf7b · 2014-01-10T08:42:54.000+09:00
Backups could be removed even if generation number was set to infinite
without caring of the day threashold calculated. Backups are removed
if they either satisfy the generation or the day threshold.
diff --git a/backup.c b/backup.c
@@ -1379,13 +1379,15 @@ delete_old_files(const char *root,
 		 * If the mtime of the file is older than the threshold and there are
 		 * enough number of files newer than the files, delete the file.
 		 */
-		if (file->mtime >= days_threshold)
+		if (file->mtime >= days_threshold &&
+			keep_days != KEEP_INFINITE)
 		{
 			elog(LOG, "%s() %lu is not older than %lu", __FUNCTION__,
 				file->mtime, days_threshold);
 			continue;
 		}
-		else if (file_num <= keep_files)
+		else if (file_num <= keep_files &&
+				 keep_files != KEEP_INFINITE)
 		{
 			elog(LOG, "%s() newer files are only %d", __FUNCTION__, file_num);
 			continue;
diff --git a/delete.c b/delete.c
@@ -129,13 +129,15 @@ pgBackupDelete(int keep_generations, int keep_days)
 			backup_num++;
 
 		/* Evaluate if this backup is eligible for removal */
-		if (backup_num <= keep_generations)
+		if (backup_num <= keep_generations &&
+			keep_generations != KEEP_INFINITE)
 		{
 			/* Do not include the latest full backup in this count */
 			elog(LOG, "%s() backup are only %d", __FUNCTION__, backup_num);
 			continue;
 		}
-		else if (backup->start_time >= days_threshold)
+		else if (backup->start_time >= days_threshold &&
+				 keep_days != KEEP_INFINITE)
 		{
 			/*
 			 * If the start time of the backup is older than the threshold and
diff --git a/expected/backup_restore.out b/expected/backup_restore.out
@@ -29,11 +29,11 @@ CHECKPOINT
 # of recovery target option in recovery.conf
 3
 # of deleted backups (show all)
-3
+4
 # of deleted backups
 0
 delete backup
 # of deleted backups
-3
+4
 # of deleted backups
-8
+9

Original file line number	Diff line number	Diff line change
`@@ -1379,13 +1379,15 @@ delete_old_files(const char *root,`
`1379`	`1379`	`* If the mtime of the file is older than the threshold and there are`
`1380`	`1380`	`* enough number of files newer than the files, delete the file.`
`1381`	`1381`	`*/`
`1382`		`- if (file->mtime >= days_threshold)`
	`1382`	`+ if (file->mtime >= days_threshold &&`
	`1383`	`+ keep_days != KEEP_INFINITE)`
`1383`	`1384`	`{`
`1384`	`1385`	`elog(LOG, "%s() %lu is not older than %lu", __FUNCTION__,`
`1385`	`1386`	`file->mtime, days_threshold);`
`1386`	`1387`	`continue;`
`1387`	`1388`	`}`
`1388`		`- else if (file_num <= keep_files)`
	`1389`	`+ else if (file_num <= keep_files &&`
	`1390`	`+ keep_files != KEEP_INFINITE)`
`1389`	`1391`	`{`
`1390`	`1392`	`elog(LOG, "%s() newer files are only %d", __FUNCTION__, file_num);`
`1391`	`1393`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -129,13 +129,15 @@ pgBackupDelete(int keep_generations, int keep_days)`
`129`	`129`	`backup_num++;`
`130`	`130`
`131`	`131`	`/* Evaluate if this backup is eligible for removal */`
`132`		`- if (backup_num <= keep_generations)`
	`132`	`+ if (backup_num <= keep_generations &&`
	`133`	`+ keep_generations != KEEP_INFINITE)`
`133`	`134`	`{`
`134`	`135`	`/* Do not include the latest full backup in this count */`
`135`	`136`	`elog(LOG, "%s() backup are only %d", __FUNCTION__, backup_num);`
`136`	`137`	`continue;`
`137`	`138`	`}`
`138`		`- else if (backup->start_time >= days_threshold)`
	`139`	`+ else if (backup->start_time >= days_threshold &&`
	`140`	`+ keep_days != KEEP_INFINITE)`
`139`	`141`	`{`
`140`	`142`	`/*`
`141`	`143`	`* If the start time of the backup is older than the threshold and`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ CHECKPOINT`
`29`	`29`	`# of recovery target option in recovery.conf`
`30`	`30`	`3`
`31`	`31`	`# of deleted backups (show all)`
`32`		`-3`
	`32`	`+4`
`33`	`33`	`# of deleted backups`
`34`	`34`	`0`
`35`	`35`	`delete backup`
`36`	`36`	`# of deleted backups`
`37`		`-3`
	`37`	`+4`
`38`	`38`	`# of deleted backups`
`39`		`-8`
	`39`	`+9`