Allow only one keep parameter to trigger log and archive deletion

Michael Paquier · Michael Paquier · commit e04426361fa3 · 2014-01-10T02:48:11.000+09:00
Same as previously, having two satisfy two conditions where most of the
users will just look for one policy usually is kind of awkward.
diff --git a/backup.c b/backup.c
@@ -1345,8 +1345,8 @@ delete_old_files(const char *root,
 			root, files_str, days_str);
 	}
 
-	/* delete files which satisfy both conditions */
-	if (keep_files == KEEP_INFINITE || keep_days == KEEP_INFINITE)
+	/* Leave if both settings are set to infinite, there is nothing to do */
+	if (keep_files == KEEP_INFINITE && keep_days == KEEP_INFINITE)
 	{
 		elog(LOG, "%s() infinite", __FUNCTION__);
 		return;
@@ -1358,6 +1358,7 @@ delete_old_files(const char *root,
 		pgFile *file = (pgFile *) parray_get(files, i);
 
 		elog(LOG, "%s() %s", __FUNCTION__, file->path);
+
 		/* Delete completed WALs only. */
 		if (is_arclog && !xlog_is_complete_wal(file))
 		{
@@ -1377,10 +1378,7 @@ delete_old_files(const char *root,
 				file->mtime, days_threshold);
 			continue;
 		}
-		elog(LOG, "%s() %lu is older than %lu", __FUNCTION__,
-			file->mtime, days_threshold);
-
-		if (file_num <= keep_files)
+		else if (file_num <= keep_files)
 		{
 			elog(LOG, "%s() newer files are only %d", __FUNCTION__, file_num);
 			continue;
diff --git a/pg_rman.txt b/pg_rman.txt
@@ -263,15 +263,15 @@ absolute paths; relative paths are not allowed.
     Specify how long backuped archive WAL files will be kept.
     --keep-arclog-files means number of backup files.
     --keep-arclog-days means days to be kept. When backup is run, only
-    files exceeded both settings are deleted from archive storage.
+    files exceeded one of those settings are deleted from archive storage.
 
 --keep-srvlog-files / --keep-srvlog-days
     Specify how long backuped serverlog files will be kept.
     --keep-srvlog-files means number of backup files.
     --keep-srvlog-days means days to be kept.
-    When backup is run, only files exceeded both settings are deleted
-    from server log directory (log_directory). This option works when
-    you specify --with-serverlog and --srvlog-path options in backup
+    When backup is run, only files exceeded one of those settings are
+    deleted from server log directory (log_directory). This option works
+    when you specify --with-serverlog and --srvlog-path options in backup
     command.
 
 - Restore options

Original file line number	Diff line number	Diff line change
`@@ -1345,8 +1345,8 @@ delete_old_files(const char *root,`
`1345`	`1345`	`root, files_str, days_str);`
`1346`	`1346`	`}`
`1347`	`1347`
`1348`		`- /* delete files which satisfy both conditions */`
`1349`		`- if (keep_files == KEEP_INFINITE \|\| keep_days == KEEP_INFINITE)`
	`1348`	`+ /* Leave if both settings are set to infinite, there is nothing to do */`
	`1349`	`+ if (keep_files == KEEP_INFINITE && keep_days == KEEP_INFINITE)`
`1350`	`1350`	`{`
`1351`	`1351`	`elog(LOG, "%s() infinite", __FUNCTION__);`
`1352`	`1352`	`return;`
`@@ -1358,6 +1358,7 @@ delete_old_files(const char *root,`
`1358`	`1358`	`pgFile file = (pgFile ) parray_get(files, i);`
`1359`	`1359`
`1360`	`1360`	`elog(LOG, "%s() %s", __FUNCTION__, file->path);`
	`1361`	`+`
`1361`	`1362`	`/* Delete completed WALs only. */`
`1362`	`1363`	`if (is_arclog && !xlog_is_complete_wal(file))`
`1363`	`1364`	`{`
`@@ -1377,10 +1378,7 @@ delete_old_files(const char *root,`
`1377`	`1378`	`file->mtime, days_threshold);`
`1378`	`1379`	`continue;`
`1379`	`1380`	`}`
`1380`		`- elog(LOG, "%s() %lu is older than %lu", __FUNCTION__,`
`1381`		`- file->mtime, days_threshold);`
`1382`		`-`
`1383`		`- if (file_num <= keep_files)`
	`1381`	`+ else if (file_num <= keep_files)`
`1384`	`1382`	`{`
`1385`	`1383`	`elog(LOG, "%s() newer files are only %d", __FUNCTION__, file_num);`
`1386`	`1384`	`continue;`