NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit342496e

Michael Paquier

committed

Fix incremental and archive backup removal on delete command

The previous algorithm was smart enough to remove full backups olderthan the given number of generations, but not enough to removeincremental and archive backups. This resulted in keeping in the backuplist a set of incremental and archive backups older than the latestfull backup allowed. As it is useless to keep them, the deletionalgorithm is made smarter to take that into account and remove all ofthem cleanly only when necessary.

1 parentc812fa3 commit342496eCopy full SHA for 342496e

File tree

1 file changed

-5

lines changed

delete.c

1 file changed

-5

lines changed

`‎delete.c`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ pgBackupDelete(int keep_generations, int keep_days)`
`80`	`80`	`intbackup_num;`
`81`	`81`	`time_tdays_threshold=current.start_time- (keep_days6060*24);`
`82`	`82`
`83`		`-`
`84`	`83`	`if (verbose)`
`85`	`84`	`{`
`86`	`85`	`chargenerations_str[100];`
`@@ -116,20 +115,21 @@ pgBackupDelete(int keep_generations, int keep_days)`
`116`	`115`	`backup_num=0;`
`117`	`116`	`for (i=0;i<parray_num(backup_list);i++)`
`118`	`117`	`{`
`119`		`-pgBackupbackup= (pgBackup)parray_get(backup_list,i);`
	`118`	`+pgBackupbackup= (pgBackup)parray_get(backup_list,i);`
	`119`	`+intbackup_num_evaluate=backup_num;`
`120`	`120`
`121`	`121`	`elog(LOG,"%s() %lu",__FUNCTION__,backup->start_time);`
`122`	`122`
`123`	`123`	`/*`
`124`	`124`	`* When a validate full backup was found, we can delete the`
`125`		`- * backup that is older than it.`
	`125`	`+ * backup that is older than it using the number of generations.`
`126`	`126`	`*/`
`127`		`-if (backup->backup_mode>=BACKUP_MODE_FULL&&`
	`127`	`+if (backup->backup_mode==BACKUP_MODE_FULL&&`
`128`	`128`	`backup->status==BACKUP_STATUS_OK)`
`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_evaluate+1 <=keep_generations&&`
`133`	`133`	`keep_generations!=KEEP_INFINITE)`
`134`	`134`	`{`
`135`	`135`	`/* Do not include the latest full backup in this count */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit342496e

File tree

1 file changed

1 file changed

`‎delete.c`

0 commit comments