Commite044263

Michael Paquier

committed

Allow only one keep parameter to trigger log and archive deletion

Same as previously, having two satisfy two conditions where most of theusers will just look for one policy usually is kind of awkward.

1 parentfcaae1a commite044263Copy full SHA for e044263

File tree

-10

lines changed

-10

lines changed

Lines changed: 4 additions & 6 deletions

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`	`pgFilefile= (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`	`+elseif (file_num <=keep_files)`
`1384`	`1382`	`{`
`1385`	`1383`	`elog(LOG,"%s() newer files are only %d",__FUNCTION__,file_num);`
`1386`	`1384`	`continue;`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -263,15 +263,15 @@ absolute paths; relative paths are not allowed.`
`263`	`263`	`Specify how long backuped archive WAL files will be kept.`
`264`	`264`	`--keep-arclog-files means number of backup files.`
`265`	`265`	`--keep-arclog-days means days to be kept. When backup is run, only`
`266`		`- files exceededboth settings are deleted from archive storage.`
	`266`	`+ files exceededone of those settings are deleted from archive storage.`
`267`	`267`
`268`	`268`	`--keep-srvlog-files / --keep-srvlog-days`
`269`	`269`	`Specify how long backuped serverlog files will be kept.`
`270`	`270`	`--keep-srvlog-files means number of backup files.`
`271`	`271`	`--keep-srvlog-days means days to be kept.`
`272`		`- When backup is run, only files exceededbothsettings are deleted`
`273`		`- from server log directory (log_directory). This option works when`
`274`		`- you specify --with-serverlog and --srvlog-path options in backup`
	`272`	`+ When backup is run, only files exceededone of thosesettings are`
	`273`	`+deletedfrom server log directory (log_directory). This option works`
	`274`	`+whenyou specify --with-serverlog and --srvlog-path options in backup`
`275`	`275`	`command.`
`276`	`276`
`277`	`277`	`- Restore options`

Comments

(0)