db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-01-30 05:39:12 +02:00
Code Issues Releases Activity

Force target-timeline=current when restore type=immediate.

Browse Source 
Explicitly set target timeline to "current" when type=immediate and PostgreSQL >= 12. We do this because type=immediate means there won't be any actual attempt to change timelines, but if we leave the target timeline as the default of "latest" then PostgreSQL might fail to restore because it can't reach the "latest" timeline in the repository from this backup.

This is really a PostgreSQL bug and will hopefully be addressed there, but we'll handle it here for older versions, at least until they aren't really seen in the wild any longer.

PostgreSQL < 12 defaults to "current" (but does not accept "current" as a parameter) so no need set it explicitly.
This commit is contained in:
David Steele 2022-07-14 08:26:03 -04:00 committed by GitHub
parent 75623d4583
commit 364af1635d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/xml/release.xml
View File

@ -45,6 +45,17 @@
<p>Create snapshot when listing contents of a path.</p>
</release-item>
<release-item>
<github-pull-request id="1814"/>
<release-item-contributor-list>
<release-item-contributor id="david.steele"/>
<release-item-reviewer id="stephen.frost"/>
</release-item-contributor-list>
<p>Force <br-option>target-timeline=current</br-option> when restore <br-option>type=immediate</br-option>.</p>
</release-item>
<release-item>
<github-pull-request id="1758"/>

19
src/command/restore/restore.c
View File

@ -41,9 +41,11 @@ Recovery constants
#define RECOVERY_TARGET_XID "recovery_target_xid"
#define RECOVERY_TARGET_ACTION "recovery_target_action"
#define RECOVERY_TARGET_INCLUSIVE "recovery_target_inclusive"
#define RECOVERY_TARGET_TIMELINE "recovery_target_timeline"
#define RECOVERY_TARGET_TIMELINE_CURRENT "current"
#define PAUSE_AT_RECOVERY_TARGET "pause_at_recovery_target"
#define STANDBY_MODE "standby_mode"
STRING_STATIC(STANDBY_MODE_STR, STANDBY_MODE);
@ -1656,9 +1658,22 @@ restoreRecoveryOption(unsigned int pgVersion)
}
}
// Write recovery_target_timeline
// Write recovery_target_timeline if set
if (cfgOptionTest(cfgOptTargetTimeline))
{
kvPut(result, VARSTRZ(RECOVERY_TARGET_TIMELINE), VARSTR(cfgOptionStr(cfgOptTargetTimeline)));
}
// Else explicitly set target timeline to "current" when type=immediate and PostgreSQL >= 12. We do this because
// type=immediate means there won't be any actual attempt to change timelines, but if we leave the target timeline as the
// default of "latest" then PostgreSQL might fail to restore because it can't reach the "latest" timeline in the repository
// from this backup.
//
// This is really a PostgreSQL bug and will hopefully be addressed there, but we'll handle it here for older versions, at
// least until they aren't really seen in the wild any longer.
//
// PostgreSQL < 12 defaults to "current" (but does not accept "current" as a parameter) so no need set it explicitly.
else if (cfgOptionStrId(cfgOptType) == CFGOPTVAL_TYPE_IMMEDIATE && pgVersion >= PG_VERSION_12)
kvPut(result, VARSTRZ(RECOVERY_TARGET_TIMELINE), VARSTRDEF(RECOVERY_TARGET_TIMELINE_CURRENT));
// Move to prior context
kvMove(result, memContextPrior());

19
test/src/module/command/restoreTest.c
View File

@ -1599,19 +1599,34 @@ testRun(void)
"check recovery options");
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("recovery target immediate");
TEST_TITLE("recovery target immediate, pg < 12");
argList = strLstDup(argBaseList);
hrnCfgArgRawZ(argList, cfgOptType, "immediate");
HRN_CFG_LOAD(cfgCmdRestore, argList);
TEST_RESULT_STR_Z(
restoreRecoveryConf(PG_VERSION_94, restoreLabel),
restoreRecoveryConf(PG_VERSION_11, restoreLabel),
RECOVERY_SETTING_HEADER
"restore_command = 'my_restore_command'\n"
"recovery_target = 'immediate'\n",
"check recovery options");
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("recovery target immediate, pg >= 12");
argList = strLstDup(argBaseList);
hrnCfgArgRawZ(argList, cfgOptType, "immediate");
HRN_CFG_LOAD(cfgCmdRestore, argList);
TEST_RESULT_STR_Z(
restoreRecoveryConf(PG_VERSION_12, restoreLabel),
RECOVERY_SETTING_HEADER
"restore_command = 'my_restore_command'\n"
"recovery_target = 'immediate'\n"
"recovery_target_timeline = 'current'\n",
"check recovery options");
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("recovery target time with timeline");