NotificationsYou must be signed in to change notification settings
Fork86
Star738

Commit73496c4

committed

Fix broken tests.validate.ValidateTest.test_validate_instance_with_several_corrupt_backups_interrupt

+fix small typo introduced in02a3665

1 parentfc752c8 commit73496c4Copy full SHA for 73496c4

File tree

1 file changed

-4

lines changed

src
- catalog.c

1 file changed

-4

lines changed

`‎src/catalog.c`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ static int grab_excl_lock_file(const char backup_dir, const char backup_id, bo`
`32`	`32`	`staticintgrab_shared_lock_file(pgBackup*backup);`
`33`	`33`	`staticintwait_shared_owners(pgBackup*backup);`
`34`	`34`
	`35`	`+`
	`36`	`+staticvoidunlink_lock_atexit(boolfatal,void*userdata);`
`35`	`37`	`staticvoidunlock_backup(constcharbackup_dir,constcharbackup_id,boolexclusive);`
`36`	`38`	`staticvoidrelease_excl_lock_file(constchar*backup_dir);`
`37`	`39`	`staticvoidrelease_shared_lock_file(constchar*backup_dir);`
`@@ -83,8 +85,8 @@ timelineInfoFree(void *tliInfo)`
`83`	`85`	`}`
`84`	`86`
`85`	`87`	`/* Iterate over locked backups and unlock them */`
`86`		`-staticvoid`
`87`		`-unlink_lock_atexit(void)`
	`88`	`+void`
	`89`	`+unlink_lock_atexit(boolunused_fatal,void*unused_userdata)`
`88`	`90`	`{`
`89`	`91`	`inti;`
`90`	`92`
`@@ -94,7 +96,7 @@ unlink_lock_atexit(void)`
`94`	`96`	`for (i=0;i<parray_num(locks);i++)`
`95`	`97`	`{`
`96`	`98`	`LockInfolock= (LockInfo)parray_get(locks,i);`
`97`		`-unlock_backup(lock->backup_dir,lock->backup_dir,lock->exclusive);`
	`99`	`+unlock_backup(lock->backup_dir,lock->backup_id,lock->exclusive);`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`parray_walk(locks,pg_free);`
`@@ -267,7 +269,7 @@ lock_backup(pgBackup *backup, bool strict, bool exclusive)`
`267`	`269`	`*/`
`268`	`270`	`if (!backup_lock_exit_hook_registered)`
`269`	`271`	`{`
`270`		`-atexit(unlink_lock_atexit);`
	`272`	`+pgut_atexit_push(unlink_lock_atexit,NULL);`
`271`	`273`	`backup_lock_exit_hook_registered= true;`
`272`	`274`	`}`
`273`	`275`

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!

Commit73496c4

File tree

1 file changed

1 file changed

`‎src/catalog.c`

0 commit comments