db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-06-18 23:57:33 +02:00
Code Issues Releases Activity

Improve stanza-create command so that it does not error when the stanza already exists.

Browse Source 
Contributed by Cynthia Shang.
This commit is contained in:
Cynthia Shang
2018-02-01 14:12:03 -05:00
committed by David Steele
parent 298b33988c
commit dc73abdb6e
8 changed files with 115 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/lib/pgBackRestTest/Module/Mock/MockStanzaTest.pm
View File

@ -81,11 +81,11 @@ sub run
#--------------------------------------------------------------------------------------------------------------------------
$oHostBackup->stanzaCreate('successfully create the stanza', {strOptionalParam => '--no-' . cfgOptionName(CFGOPT_ONLINE)});
# Rerun stanza-create and confirm failure - need use force since archive.info and backup.info exist
# Rerun stanza-create and confirm it does not fail
#--------------------------------------------------------------------------------------------------------------------------
$oHostBackup->stanzaCreate(
'fail on rerun of stanza-create - info files exist',
{iExpectedExitStatus => ERROR_PATH_NOT_EMPTY, strOptionalParam => '--no-' . cfgOptionName(CFGOPT_ONLINE)});
'do not fail on rerun of stanza-create - info files exist and DB section ok',
{strOptionalParam => '--no-' . cfgOptionName(CFGOPT_ONLINE)});
# Stanza Create fails when not using force - database mismatch with pg_control file
#--------------------------------------------------------------------------------------------------------------------------
@ -130,7 +130,6 @@ sub run
if (!$bRepoEncrypt)
{
$oHostBackup->stanzaCreate('fail on archive info file missing from non-empty dir',
{iExpectedExitStatus => ERROR_FILE_MISSING, strOptionalParam => '--no-' . cfgOptionName(CFGOPT_ONLINE)});
}
@ -165,10 +164,10 @@ sub run
{strOptionalParam => '--no-' . cfgOptionName(CFGOPT_ONLINE) . ' --' . cfgOptionName(CFGOPT_FORCE),
iExpectedExitStatus => $bRepoEncrypt ? ERROR_FILE_MISSING : undef});
# Rerun without the force to ensure the files exist
$oHostBackup->stanzaCreate('repeat create - error that files exist',
{iExpectedExitStatus => $bRepoEncrypt ? ERROR_FILE_MISSING : ERROR_PATH_NOT_EMPTY,
strOptionalParam => '--no-' . cfgOptionName(CFGOPT_ONLINE)});
if (!$bRepoEncrypt)
{
$self->testResult(sub {storageRepo()->exists($strArchiveInfoFile)}, true, " archive.info file was created");
}
# Stanza Create succeeds when using force - recreates archive.info from uncompressed archive file
#--------------------------------------------------------------------------------------------------------------------------