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

Simplify base path mode in mock/all integration tests.

Browse Source 
Change the mode back to 0700 earlier to reduce churn in the expect logs.

This will be especially important in a future commit that gets the defaults exclusively from the base path.
This commit is contained in:
David Steele
2022-01-21 08:52:51 -05:00
parent 8c062e1af8
commit b0db4b8ff0
4 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/xml/release.xml
View File

@ -65,6 +65,7 @@
<commit subject="Refactor backupProcessQueue() to use BackupJobData struct."/> <commit subject="Refactor backupProcessQueue() to use BackupJobData struct."/>
<commit subject="Use the PG_FILE_POSTMTRPID constant where appropriate."/> <commit subject="Use the PG_FILE_POSTMTRPID constant where appropriate."/>
<commit subject="Remove primary flag from manifest."/> <commit subject="Remove primary flag from manifest."/>
<commit subject="Simplify base path mode in mock/all integration tests."/>
<release-item-contributor-list> <release-item-contributor-list>
<release-item-contributor id="david.steele"/> <release-item-contributor id="david.steele"/>

42
test/expect/mock-all-001.log
View File

@ -897,7 +897,7 @@ group="[GROUP-1]"
user="[USER-1]" user="[USER-1]"
[target:path] [target:path]
pg_data={"mode":"0777"} pg_data={}
pg_data/base={} pg_data/base={}
pg_data/base/1={} pg_data/base/1={}
pg_data/base/16384={} pg_data/base/16384={}
@ -914,7 +914,7 @@ pg_data/pg_stat={}
pg_data/pg_stat_tmp={} pg_data/pg_stat_tmp={}
pg_data/pg_subtrans={} pg_data/pg_subtrans={}
pg_data/pg_tblspc={} pg_data/pg_tblspc={}
pg_tblspc={"mode":"0777"} pg_tblspc={}
pg_tblspc/1={} pg_tblspc/1={}
pg_tblspc/1/[TS_PATH-1]={} pg_tblspc/1/[TS_PATH-1]={}
pg_tblspc/1/[TS_PATH-1]/16384={} pg_tblspc/1/[TS_PATH-1]/16384={}
@ -1116,7 +1116,7 @@ group="[GROUP-1]"
user="[USER-1]" user="[USER-1]"
[target:path] [target:path]
pg_data={"mode":"0777"} pg_data={}
pg_data/base={} pg_data/base={}
pg_data/base/1={} pg_data/base/1={}
pg_data/base/16384={} pg_data/base/16384={}
@ -1133,7 +1133,7 @@ pg_data/pg_stat={}
pg_data/pg_stat_tmp={} pg_data/pg_stat_tmp={}
pg_data/pg_subtrans={} pg_data/pg_subtrans={}
pg_data/pg_tblspc={} pg_data/pg_tblspc={}
pg_tblspc={"mode":"0777"} pg_tblspc={}
pg_tblspc/1={} pg_tblspc/1={}
pg_tblspc/1/[TS_PATH-1]={} pg_tblspc/1/[TS_PATH-1]={}
pg_tblspc/1/[TS_PATH-1]/16384={} pg_tblspc/1/[TS_PATH-1]/16384={}
@ -1330,7 +1330,7 @@ group="[GROUP-1]"
user="[USER-1]" user="[USER-1]"
[target:path] [target:path]
pg_data={"mode":"0777"} pg_data={}
pg_data/base={} pg_data/base={}
pg_data/base/1={} pg_data/base/1={}
pg_data/base/16384={} pg_data/base/16384={}
@ -1347,7 +1347,7 @@ pg_data/pg_stat={}
pg_data/pg_stat_tmp={} pg_data/pg_stat_tmp={}
pg_data/pg_subtrans={} pg_data/pg_subtrans={}
pg_data/pg_tblspc={} pg_data/pg_tblspc={}
pg_tblspc={"mode":"0777"} pg_tblspc={}
pg_tblspc/1={} pg_tblspc/1={}
pg_tblspc/1/[TS_PATH-1]={} pg_tblspc/1/[TS_PATH-1]={}
pg_tblspc/1/[TS_PATH-1]/16384={} pg_tblspc/1/[TS_PATH-1]/16384={}
@ -1398,7 +1398,6 @@ P00 INFO: map tablespace 'pg_tblspc/2' to '[TEST_PATH]/db-primary/db/tablespac
P00 DETAIL: check '[TEST_PATH]/db-primary/db/base-2' exists P00 DETAIL: check '[TEST_PATH]/db-primary/db/base-2' exists
P00 DETAIL: check '[TEST_PATH]/db-primary/db/tablespace/ts1-2/[TS_PATH-1]' exists P00 DETAIL: check '[TEST_PATH]/db-primary/db/tablespace/ts1-2/[TS_PATH-1]' exists
P00 DETAIL: check '[TEST_PATH]/db-primary/db/tablespace/ts2-2/[TS_PATH-1]' exists P00 DETAIL: check '[TEST_PATH]/db-primary/db/tablespace/ts2-2/[TS_PATH-1]' exists
P00 DETAIL: update mode for '[TEST_PATH]/db-primary/db/base-2' to 0777
P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base' P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base'
P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base/1' P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base/1'
P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base/16384' P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base/16384'
@ -1688,7 +1687,7 @@ group="[GROUP-1]"
user="[USER-1]" user="[USER-1]"
[target:path] [target:path]
pg_data={"mode":"0777"} pg_data={}
pg_data/base={} pg_data/base={}
pg_data/base/1={} pg_data/base/1={}
pg_data/base/16384={} pg_data/base/16384={}
@ -1705,7 +1704,7 @@ pg_data/pg_stat={}
pg_data/pg_stat_tmp={} pg_data/pg_stat_tmp={}
pg_data/pg_subtrans={} pg_data/pg_subtrans={}
pg_data/pg_tblspc={} pg_data/pg_tblspc={}
pg_tblspc={"mode":"0777"} pg_tblspc={}
pg_tblspc/2={} pg_tblspc/2={}
pg_tblspc/2/[TS_PATH-1]={} pg_tblspc/2/[TS_PATH-1]={}
pg_tblspc/2/[TS_PATH-1]/32768={} pg_tblspc/2/[TS_PATH-1]/32768={}
@ -1907,7 +1906,7 @@ group="[GROUP-1]"
user="[USER-1]" user="[USER-1]"
[target:path] [target:path]
pg_data={"mode":"0777"} pg_data={}
pg_data/base={} pg_data/base={}
pg_data/base/1={} pg_data/base/1={}
pg_data/base/16384={} pg_data/base/16384={}
@ -1924,7 +1923,7 @@ pg_data/pg_stat={}
pg_data/pg_stat_tmp={} pg_data/pg_stat_tmp={}
pg_data/pg_subtrans={} pg_data/pg_subtrans={}
pg_data/pg_tblspc={} pg_data/pg_tblspc={}
pg_tblspc={"mode":"0777"} pg_tblspc={}
pg_tblspc/2={} pg_tblspc/2={}
pg_tblspc/2/[TS_PATH-1]={} pg_tblspc/2/[TS_PATH-1]={}
pg_tblspc/2/[TS_PATH-1]/32768={} pg_tblspc/2/[TS_PATH-1]/32768={}
@ -2123,7 +2122,7 @@ group="[GROUP-1]"
user="[USER-1]" user="[USER-1]"
[target:path] [target:path]
pg_data={"mode":"0777"} pg_data={}
pg_data/base={} pg_data/base={}
pg_data/base/1={} pg_data/base/1={}
pg_data/base/16384={} pg_data/base/16384={}
@ -2140,7 +2139,7 @@ pg_data/pg_stat={}
pg_data/pg_stat_tmp={} pg_data/pg_stat_tmp={}
pg_data/pg_subtrans={} pg_data/pg_subtrans={}
pg_data/pg_tblspc={} pg_data/pg_tblspc={}
pg_tblspc={"mode":"0777"} pg_tblspc={}
pg_tblspc/2={} pg_tblspc/2={}
pg_tblspc/2/[TS_PATH-1]={} pg_tblspc/2/[TS_PATH-1]={}
pg_tblspc/2/[TS_PATH-1]/32768={} pg_tblspc/2/[TS_PATH-1]/32768={}
@ -2338,7 +2337,7 @@ group="[GROUP-1]"
user="[USER-1]" user="[USER-1]"
[target:path] [target:path]
pg_data={"mode":"0777"} pg_data={}
pg_data/base={} pg_data/base={}
pg_data/base/1={} pg_data/base/1={}
pg_data/base/16384={} pg_data/base/16384={}
@ -2355,7 +2354,7 @@ pg_data/pg_stat={}
pg_data/pg_stat_tmp={} pg_data/pg_stat_tmp={}
pg_data/pg_subtrans={} pg_data/pg_subtrans={}
pg_data/pg_tblspc={} pg_data/pg_tblspc={}
pg_tblspc={"mode":"0777"} pg_tblspc={}
pg_tblspc/2={} pg_tblspc/2={}
pg_tblspc/2/[TS_PATH-1]={} pg_tblspc/2/[TS_PATH-1]={}
pg_tblspc/2/[TS_PATH-1]/32768={} pg_tblspc/2/[TS_PATH-1]/32768={}
@ -2536,7 +2535,7 @@ group="[GROUP-1]"
user="[USER-1]" user="[USER-1]"
[target:path] [target:path]
pg_data={"mode":"0777"} pg_data={}
pg_data/base={} pg_data/base={}
pg_data/base/1={} pg_data/base/1={}
pg_data/base/16384={} pg_data/base/16384={}
@ -2553,7 +2552,7 @@ pg_data/pg_stat={}
pg_data/pg_stat_tmp={} pg_data/pg_stat_tmp={}
pg_data/pg_subtrans={} pg_data/pg_subtrans={}
pg_data/pg_tblspc={} pg_data/pg_tblspc={}
pg_tblspc={"mode":"0777"} pg_tblspc={}
pg_tblspc/2={} pg_tblspc/2={}
pg_tblspc/2/[TS_PATH-1]={} pg_tblspc/2/[TS_PATH-1]={}
pg_tblspc/2/[TS_PATH-1]/32768={} pg_tblspc/2/[TS_PATH-1]/32768={}
@ -2753,7 +2752,7 @@ group="[GROUP-1]"
user="[USER-1]" user="[USER-1]"
[target:path] [target:path]
pg_data={"mode":"0777"} pg_data={}
pg_data/base={} pg_data/base={}
pg_data/base/1={} pg_data/base/1={}
pg_data/base/16384={} pg_data/base/16384={}
@ -2770,7 +2769,7 @@ pg_data/pg_stat={}
pg_data/pg_stat_tmp={} pg_data/pg_stat_tmp={}
pg_data/pg_subtrans={} pg_data/pg_subtrans={}
pg_data/pg_tblspc={} pg_data/pg_tblspc={}
pg_tblspc={"mode":"0777"} pg_tblspc={}
pg_tblspc/2={} pg_tblspc/2={}
pg_tblspc/2/[TS_PATH-1]={} pg_tblspc/2/[TS_PATH-1]={}
pg_tblspc/2/[TS_PATH-1]/32768={} pg_tblspc/2/[TS_PATH-1]/32768={}
@ -2957,7 +2956,6 @@ P00 INFO: remap data directory to '[TEST_PATH]/db-primary/db/base-2/base'
P00 INFO: map tablespace 'pg_tblspc/2' to '../../tablespace/ts2' P00 INFO: map tablespace 'pg_tblspc/2' to '../../tablespace/ts2'
P00 DETAIL: check '[TEST_PATH]/db-primary/db/base-2/base' exists P00 DETAIL: check '[TEST_PATH]/db-primary/db/base-2/base' exists
P00 DETAIL: check '[TEST_PATH]/db-primary/db/base-2/tablespace/ts2/[TS_PATH-1]' exists P00 DETAIL: check '[TEST_PATH]/db-primary/db/base-2/tablespace/ts2/[TS_PATH-1]' exists
P00 DETAIL: update mode for '[TEST_PATH]/db-primary/db/base-2/base' to 0777
P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base/base' P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base/base'
P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base/base/1' P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base/base/1'
P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base/base/16384' P00 DETAIL: create path '[TEST_PATH]/db-primary/db/base-2/base/base/16384'
@ -3167,7 +3165,7 @@ group="[GROUP-1]"
user="[USER-1]" user="[USER-1]"
[target:path] [target:path]
pg_data={"mode":"0777"} pg_data={}
pg_data/base={} pg_data/base={}
pg_data/base/1={} pg_data/base/1={}
pg_data/base/16384={} pg_data/base/16384={}
@ -3184,7 +3182,7 @@ pg_data/pg_stat={}
pg_data/pg_stat_tmp={} pg_data/pg_stat_tmp={}
pg_data/pg_subtrans={} pg_data/pg_subtrans={}
pg_data/pg_tblspc={} pg_data/pg_tblspc={}
pg_tblspc={"mode":"0777"} pg_tblspc={}
pg_tblspc/2={} pg_tblspc/2={}
pg_tblspc/2/[TS_PATH-1]={} pg_tblspc/2/[TS_PATH-1]={}
pg_tblspc/2/[TS_PATH-1]/32768={} pg_tblspc/2/[TS_PATH-1]/32768={}

6
test/lib/pgBackRestTest/Env/Host/HostBackupTest.pm
View File

@ -2239,7 +2239,11 @@ sub restoreCompare
# Delete the list of DBs # Delete the list of DBs
delete($$oExpectedManifestRef{&MANIFEST_SECTION_DB}); delete($$oExpectedManifestRef{&MANIFEST_SECTION_DB});
$self->manifestDefault($oExpectedManifestRef); # Only update defaults if the expect manifest is synthetic. If loaded from a file the defaults will already be correct.
if ($self->synthetic())
{
$self->manifestDefault($oExpectedManifestRef);
}
# Newer Perls will change this variable to a number whenever a numeric comparison is performed. It is expected to be a string so # Newer Perls will change this variable to a number whenever a numeric comparison is performed. It is expected to be a string so
# make sure it is one before saving. # make sure it is one before saving.

28
test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm
View File

@ -682,15 +682,13 @@ sub run
{&MANIFEST_SUBKEY_USER => undef, &MANIFEST_SUBKEY_GROUP => undef}}}, {&MANIFEST_SUBKEY_USER => undef, &MANIFEST_SUBKEY_GROUP => undef}}},
false); false);
delete($oManifest{&MANIFEST_SECTION_TARGET_PATH}{&MANIFEST_TARGET_PGDATA}{&MANIFEST_SUBKEY_USER}); $oManifest{&MANIFEST_SECTION_TARGET_PATH}{&MANIFEST_TARGET_PGDATA}{&MANIFEST_SUBKEY_USER} = TEST_USER;
delete($oManifest{&MANIFEST_SECTION_TARGET_PATH}{&MANIFEST_TARGET_PGDATA}{&MANIFEST_SUBKEY_GROUP}); $oManifest{&MANIFEST_SECTION_TARGET_PATH}{&MANIFEST_TARGET_PGDATA}{&MANIFEST_SUBKEY_GROUP} = TEST_GROUP;
delete( $oManifest{&MANIFEST_SECTION_TARGET_FILE}{MANIFEST_TARGET_PGDATA . '/base/1/' . DB_FILE_PGVERSION}
$oManifest{&MANIFEST_SECTION_TARGET_FILE}{MANIFEST_TARGET_PGDATA . '/base/1/' . DB_FILE_PGVERSION} {&MANIFEST_SUBKEY_USER} = TEST_USER;
{&MANIFEST_SUBKEY_USER}); $oManifest{&MANIFEST_SECTION_TARGET_FILE}{MANIFEST_TARGET_PGDATA . '/base/16384/' . DB_FILE_PGVERSION}
delete( {&MANIFEST_SUBKEY_GROUP} = TEST_GROUP;
$oManifest{&MANIFEST_SECTION_TARGET_FILE}{MANIFEST_TARGET_PGDATA . '/base/16384/' . DB_FILE_PGVERSION}
{&MANIFEST_SUBKEY_GROUP});
$oHostDbPrimary->restore( $oHostDbPrimary->restore(
'fix permissions', $strFullBackup, 'fix permissions', $strFullBackup,
@ -737,6 +735,13 @@ sub run
$strType = CFGOPTVAL_BACKUP_TYPE_INCR; $strType = CFGOPTVAL_BACKUP_TYPE_INCR;
$oHostDbPrimary->manifestReference(\%oManifest, $strFullBackup); $oHostDbPrimary->manifestReference(\%oManifest, $strFullBackup);
# Fix mode on base path so defaults are simpler in backups
if (!$bRemote)
{
$oHostDbPrimary->executeSimple('chmod 700 ' . $oHostDbPrimary->dbBasePath(), undef, 'root');
$oManifest{&MANIFEST_SECTION_TARGET_PATH}{&MANIFEST_TARGET_PGDATA}{&MANIFEST_SUBKEY_MODE} = '0700';
}
# Add tablespace 1 # Add tablespace 1
$oHostDbPrimary->manifestTablespaceCreate(\%oManifest, 1); $oHostDbPrimary->manifestTablespaceCreate(\%oManifest, 1);
$oHostDbPrimary->manifestPathCreate(\%oManifest, MANIFEST_TARGET_PGTBLSPC . '/1', '16384'); $oHostDbPrimary->manifestPathCreate(\%oManifest, MANIFEST_TARGET_PGTBLSPC . '/1', '16384');
@ -875,13 +880,6 @@ sub run
$oRemapHash{&MANIFEST_TARGET_PGTBLSPC . '/1'} = $oHostDbPrimary->tablespacePath(1, 2); $oRemapHash{&MANIFEST_TARGET_PGTBLSPC . '/1'} = $oHostDbPrimary->tablespacePath(1, 2);
$oRemapHash{&MANIFEST_TARGET_PGTBLSPC . '/2'} = $oHostDbPrimary->tablespacePath(2, 2); $oRemapHash{&MANIFEST_TARGET_PGTBLSPC . '/2'} = $oHostDbPrimary->tablespacePath(2, 2);
# At this point the $PG_DATA permissions have been reset to 0700
if (!$bRemote)
{
$oManifest{&MANIFEST_SECTION_TARGET_PATH}{&MANIFEST_TARGET_PGDATA}{&MANIFEST_SUBKEY_MODE} = '0777';
$oManifest{&MANIFEST_SECTION_TARGET_PATH}{&MANIFEST_TARGET_PGTBLSPC}{&MANIFEST_SUBKEY_MODE} = '0777';
}
$oHostDbPrimary->restore( $oHostDbPrimary->restore(
'remap all paths', $strBackup, {rhExpectedManifest => \%oManifest, rhRemapHash => \%oRemapHash}); 'remap all paths', $strBackup, {rhExpectedManifest => \%oManifest, rhRemapHash => \%oRemapHash});