db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2026-06-20 01:17:49 +02:00
Code Issues Releases Activity

Rename retention-* options to repo-retention-*.

Browse Source
This commit is contained in:
David Steele
2018-02-19 15:07:24 -05:00
parent f75ba7db94
commit 64a7196cb6
30 changed files with 778 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/lib/pgBackRestTest/Env/ExpireEnvTest.pm
+5 -5
View File
@@ -553,24 +553,24 @@ sub process
if (defined($iExpireFull))
{
$strCommand .= ' --retention-full=' . $iExpireFull;
$strCommand .= ' --repo1-retention-full=' . $iExpireFull;
}
if (defined($iExpireDiff))
{
$strCommand .= ' --retention-diff=' . $iExpireDiff;
$strCommand .= ' --repo1-retention-diff=' . $iExpireDiff;
}
if (defined($strExpireArchiveType))
{
if (defined($iExpireArchive))
{
$strCommand .= ' --retention-archive-type=' . $strExpireArchiveType .
' --retention-archive=' . $iExpireArchive;
$strCommand .= ' --repo1-retention-archive-type=' . $strExpireArchiveType .
' --repo1-retention-archive=' . $iExpireArchive;
}
else
{
$strCommand .= ' --retention-archive-type=' . $strExpireArchiveType;
$strCommand .= ' --repo1-retention-archive-type=' . $strExpireArchiveType;
}
}
test/lib/pgBackRestTest/Env/Host/HostBackupTest.pm
+2 -2
View File
@@ -695,8 +695,8 @@ sub expire
$self->backrestExe() .
' --config=' . $self->backrestConfig() .
' --log-level-console=detail' .
(defined($$oParam{iRetentionFull}) ? " --retention-full=$$oParam{iRetentionFull}" : '') .
(defined($$oParam{iRetentionDiff}) ? " --retention-diff=$$oParam{iRetentionDiff}" : '') .
(defined($$oParam{iRetentionFull}) ? " --repo1-retention-full=$$oParam{iRetentionFull}" : '') .
(defined($$oParam{iRetentionDiff}) ? " --repo1-retention-diff=$$oParam{iRetentionDiff}" : '') .
' --stanza=' . $self->stanza() . ' expire',
{strComment => $strComment, iExpectedExitStatus => $$oParam{iExpectedExitStatus}, oLogTest => $self->{oLogTest},
bLogOutput => $self->synthetic()});