db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-01-18 04:58:51 +02:00
Code Issues Releases Activity

Fix restore --force acting like --force --delta.

Browse Source 
This caused restore to replace files based on timestamp and size rather than overwriting, which meant some files that should have been updated were left unchanged. Normal restore and restore --delta were not affected by this issue.
This commit is contained in:
David Steele 2020-07-06 15:03:24 -04:00 committed by GitHub
parent 8409ab7b2b
commit 682ac656f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 80 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/xml/release.xml
View File

@ -14,6 +14,18 @@
<release-list>
<release date="XXXX-XX-XX" version="2.28dev" title="UNDER DEVELOPMENT">
<release-core-list>
<release-bug-list>
<release-item>
<release-item-contributor-list>
<release-item-reviewer id="cynthia.shang"/>
</release-item-contributor-list>
<p>Fix <cmd>restore</cmd> <br-option>--force</br-option> acting like <br-option>--force --delta</br-option>.</p>
<p>This caused <cmd>restore</cmd> to replace files based on timestamp and size rather than overwriting, which meant some files that should have been updated were left unchanged. Normal <cmd>restore</cmd> and <cmd>restore</cmd> <br-option>--delta</br-option> were not affected by this issue.</p>
</release-item>
</release-bug-list>
<release-feature-list>
<release-item>
<release-item-contributor-list>

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

@ -1971,8 +1971,8 @@ static ProtocolParallelJob *restoreJobCallback(void *data, unsigned int clientId
protocolCommandParamAdd(command, VARSTR(file->user));
protocolCommandParamAdd(command, VARSTR(file->group));
protocolCommandParamAdd(command, VARUINT64((uint64_t)manifestData(jobData->manifest)->backupTimestampCopyStart));
protocolCommandParamAdd(command, VARBOOL(cfgOptionBool(cfgOptDelta) || cfgOptionBool(cfgOptForce)));
protocolCommandParamAdd(command, VARBOOL(cfgOptionBool(cfgOptForce)));
protocolCommandParamAdd(command, VARBOOL(cfgOptionBool(cfgOptDelta)));
protocolCommandParamAdd(command, VARBOOL(cfgOptionBool(cfgOptDelta) && cfgOptionBool(cfgOptForce)));
protocolCommandParamAdd(command, VARSTR(jobData->cipherSubPass));
// Remove job from the queue

4
test/lib/pgBackRestTest/Module/Real/RealAllTest.pm
View File

@ -63,8 +63,8 @@ sub run
{pg => PG_VERSION_96, repoDest => HOST_BACKUP, storage => POSIX, encrypt => false, compress => NONE},
{pg => PG_VERSION_10, repoDest => HOST_DB_STANDBY, storage => S3, encrypt => true, compress => GZ},
{pg => PG_VERSION_11, repoDest => HOST_BACKUP, storage => AZURE, encrypt => false, compress => ZST},
{pg => PG_VERSION_12, repoDest => HOST_DB_STANDBY, storage => S3, encrypt => true, compress => LZ4},
{pg => PG_VERSION_13, repoDest => HOST_BACKUP, storage => AZURE, encrypt => false, compress => ZST},
{pg => PG_VERSION_12, repoDest => HOST_BACKUP, storage => S3, encrypt => true, compress => LZ4},
{pg => PG_VERSION_13, repoDest => HOST_DB_STANDBY, storage => AZURE, encrypt => false, compress => ZST},
)
{
# Only run tests for this pg version

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

@ -1801,7 +1801,7 @@ testRun(void)
"16384 {path}\n");
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("full restore with force");
TEST_TITLE("full restore with delta force");
argList = strLstNew();
strLstAddZ(argList, "--stanza=test1");
@ -1809,6 +1809,7 @@ testRun(void)
strLstAdd(argList, strNewFmt("--pg1-path=%s", strPtr(pgPath)));
strLstAddZ(argList, "--type=preserve");
strLstAddZ(argList, "--set=20161219-212741F");
strLstAddZ(argList, "--" CFGOPT_DELTA);
strLstAddZ(argList, "--force");
harnessCfgLoad(cfgCmdRestore, argList);
@ -1821,6 +1822,11 @@ testRun(void)
// Add a special file that will be removed
TEST_SYSTEM_FMT("mkfifo %s/pipe", strPtr(pgPath));
// Overwrite PG_VERSION with bogus content that will not be detected by delta force because the time and size are the same
storagePutP(
storageNewWriteP(storagePgWrite(), STRDEF(PG_FILE_PGVERSION), .modeFile = 0600, .timeModified = 1482182860),
BUFSTRDEF("BOG\n"));
// Change destination of tablespace link
storageRemoveP(storagePgWrite(), STRDEF("pg_tblspc/1"), .errorOnMissing = true);
THROW_ON_SYS_ERROR(
@ -1908,6 +1914,63 @@ testRun(void)
"16384 {path}\n"
"16384/PG_VERSION {file, s=4, t=1482182860}\n");
// PG_VERSION was not restored because delta force relies on time and size which were the same in the manifest and on disk
TEST_RESULT_STR_Z(
strNewBuf(storageGetP(storageNewReadP(storagePg(), STRDEF(PG_FILE_PGVERSION)))), "BOG\n",
"check PG_VERSION was not restored");
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("full restore with force");
argList = strLstNew();
strLstAddZ(argList, "--" CFGOPT_STANZA "=test1");
strLstAdd(argList, strNewFmt("--" CFGOPT_REPO1_PATH "=%s", strPtr(repoPath)));
strLstAdd(argList, strNewFmt("--" CFGOPT_PG1_PATH "=%s", strPtr(pgPath)));
strLstAddZ(argList, "--" CFGOPT_TYPE "=" RECOVERY_TYPE_PRESERVE);
strLstAddZ(argList, "--" CFGOPT_SET "=20161219-212741F");
strLstAddZ(argList, "--" CFGOPT_FORCE);
harnessCfgLoad(cfgCmdRestore, argList);
cmdRestore();
TEST_RESULT_LOG(
"P00 INFO: restore backup set 20161219-212741F\n"
"P00 DETAIL: check '{[path]}/pg' exists\n"
"P00 DETAIL: check '{[path]}/ts/1' exists\n"
"P00 INFO: remove invalid files/links/paths from '{[path]}/pg'\n"
"P00 INFO: remove invalid files/links/paths from '{[path]}/ts/1'\n"
"P01 INFO: restore file {[path]}/pg/PG_VERSION (4B, 50%) checksum 797e375b924134687cbf9eacd37a4355f3d825e4\n"
"P01 INFO: restore file {[path]}/pg/tablespace_map (0B, 50%)\n"
"P01 INFO: restore file {[path]}/pg/pg_tblspc/1/16384/PG_VERSION (4B, 100%)"
" checksum 797e375b924134687cbf9eacd37a4355f3d825e4\n"
"P00 WARN: recovery type is preserve but recovery file does not exist at '{[path]}/pg/recovery.conf'\n"
"P00 DETAIL: sync path '{[path]}/pg'\n"
"P00 DETAIL: sync path '{[path]}/pg/pg_tblspc'\n"
"P00 DETAIL: sync path '{[path]}/pg/pg_tblspc/1'\n"
"P00 DETAIL: sync path '{[path]}/pg/pg_tblspc/1/16384'\n"
"P00 WARN: backup does not contain 'global/pg_control' -- cluster will not start\n"
"P00 DETAIL: sync path '{[path]}/pg/global'");
testRestoreCompare(
storagePg(), NULL, manifest,
". {path}\n"
"PG_VERSION {file, s=4, t=1482182860}\n"
"global {path}\n"
"pg_tblspc {path}\n"
"pg_tblspc/1 {link, d={[path]}/ts/1}\n"
"tablespace_map {file, s=0, t=1482182860}\n");
testRestoreCompare(
storagePg(), STRDEF("pg_tblspc/1"), manifest,
". {link, d={[path]}/ts/1}\n"
"16384 {path}\n"
"16384/PG_VERSION {file, s=4, t=1482182860}\n");
// PG_VERSION was restored by the force option
TEST_RESULT_STR_Z(
strNewBuf(storageGetP(storageNewReadP(storagePg(), STRDEF(PG_FILE_PGVERSION)))), PG_VERSION_84_STR "\n",
"check PG_VERSION was restored");
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("incremental delta selective restore");