NotificationsYou must be signed in to change notification settings
Fork91
Star761

Commit9c83463

committed

Consider DELETING status within merge_backups()

1 parentaf340b9 commit9c83463Copy full SHA for 9c83463

File tree

1 file changed

-9

lines changed

src
- merge.c

1 file changed

-9

lines changed

`‎src/merge.c‎`

Lines changed: 8 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ do_merge(time_t backup_id)`
`81`	`81`	`/* It is possible that previous merging was interrupted */`
`82`	`82`	`backup->status!=BACKUP_STATUS_MERGING&&`
`83`	`83`	`backup->status!=BACKUP_STATUS_DELETING)`
`84`		`-elog(ERROR,"Backup %s has status: %s",`
`85`		`-base36enc(backup->start_time),status2str(backup->status));`
	`84`	`+elog(ERROR,"Backup %s has status: %s",`
	`85`	`+base36enc(backup->start_time),status2str(backup->status));`
`86`	`86`
`87`	`87`	`if (backup->backup_mode==BACKUP_MODE_FULL)`
`88`	`88`	`elog(ERROR,"Backup %s is full backup",`
`@@ -109,10 +109,8 @@ do_merge(time_t backup_id)`
`109`	`109`	`if (full_backup->status!=BACKUP_STATUS_OK&&`
`110`	`110`	`/* It is possible that previous merging was interrupted */`
`111`	`111`	`full_backup->status!=BACKUP_STATUS_MERGING)`
`112`		`-elog(ERROR,"Backup %s has status: %s",`
`113`		`-base36enc(full_backup->start_time),status2str(full_backup->status));`
`114`		`-`
`115`		`-//Assert(full_backup_idx != dest_backup_idx);`
	`112`	`+elog(ERROR,"Backup %s has status: %s",`
	`113`	`+base36enc(full_backup->start_time),status2str(full_backup->status));`
`116`	`114`
`117`	`115`	`/* form merge list */`
`118`	`116`	`while(dest_backup->parent_backup_link)`
`@@ -122,8 +120,8 @@ do_merge(time_t backup_id)`
`122`	`120`	`/* It is possible that previous merging was interrupted */`
`123`	`121`	`dest_backup->status!=BACKUP_STATUS_MERGING&&`
`124`	`122`	`dest_backup->status!=BACKUP_STATUS_DELETING)`
`125`		`-elog(ERROR,"Backup %s has status: %s",`
`126`		`-base36enc(dest_backup->start_time),status2str(dest_backup->status));`
	`123`	`+elog(ERROR,"Backup %s has status: %s",`
	`124`	`+base36enc(dest_backup->start_time),status2str(dest_backup->status));`
`127`	`125`
`128`	`126`	`parray_append(merge_list,dest_backup);`
`129`	`127`	`dest_backup=dest_backup->parent_backup_link;`
`@@ -205,7 +203,8 @@ merge_backups(pgBackup to_backup, pgBackup from_backup)`
`205`	`203`	`* BACKUP_STATUS_MERGING status.`
`206`	`204`	`*/`
`207`	`205`	`Assert(from_backup->status==BACKUP_STATUS_OK\|\|`
`208`		`-from_backup->status==BACKUP_STATUS_MERGING);`
	`206`	`+from_backup->status==BACKUP_STATUS_MERGING\|\|`
	`207`	`+from_backup->status==BACKUP_STATUS_DELETING);`
`209`	`208`	`pgBackupValidate(from_backup);`
`210`	`209`	`if (from_backup->status==BACKUP_STATUS_CORRUPT)`
`211`	`210`	`elog(ERROR,"Interrupt merging");`

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!

Commit9c83463

File tree

1 file changed

1 file changed

`‎src/merge.c‎`

0 commit comments