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

Restore tablespace remaps are working.

Browse Source
This commit is contained in:
David Steele
2015-01-22 20:11:33 -05:00
parent df4b50b977
commit 21c715b25c
6 changed files with 112 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pg_backrest.pl
View File

@ -435,7 +435,7 @@ if (operation_get() eq OP_RESTORE)
( (
config_key_load(CONFIG_SECTION_STANZA, CONFIG_KEY_PATH), config_key_load(CONFIG_SECTION_STANZA, CONFIG_KEY_PATH),
param_get(PARAM_SET), param_get(PARAM_SET),
undef, #param_get(PARAM_REMAP), config_section_load(CONFIG_SECTION_TABLESPACE_MAP),
$oFile, $oFile,
undef, #param_get(PARAM_THREAD), undef, #param_get(PARAM_THREAD),
param_get(PARAM_DELTA), param_get(PARAM_DELTA),

19
lib/BackRest/Config.pm
View File

@ -17,7 +17,7 @@ use BackRest::Utility;
use Exporter qw(import); use Exporter qw(import);
our @EXPORT = qw(config_load config_key_load operation_get operation_set param_get our @EXPORT = qw(config_load config_key_load config_section_load operation_get operation_set param_get
FILE_MANIFEST FILE_VERSION FILE_POSTMASTER_PID FILE_MANIFEST FILE_VERSION FILE_POSTMASTER_PID
PATH_LATEST PATH_LATEST
@ -30,7 +30,8 @@ our @EXPORT = qw(config_load config_key_load operation_get operation_set param_g
PARAM_VERSION PARAM_HELP PARAM_TEST PARAM_TEST_DELAY PARAM_TEST_NO_FORK PARAM_VERSION PARAM_HELP PARAM_TEST PARAM_TEST_DELAY PARAM_TEST_NO_FORK
CONFIG_SECTION_COMMAND CONFIG_SECTION_COMMAND_OPTION CONFIG_SECTION_LOG CONFIG_SECTION_BACKUP CONFIG_SECTION_COMMAND CONFIG_SECTION_COMMAND_OPTION CONFIG_SECTION_LOG CONFIG_SECTION_BACKUP
CONFIG_SECTION_RESTORE CONFIG_SECTION_ARCHIVE CONFIG_SECTION_RETENTION CONFIG_SECTION_STANZA CONFIG_SECTION_RESTORE CONFIG_SECTION_TABLESPACE_MAP CONFIG_SECTION_ARCHIVE CONFIG_SECTION_RETENTION
CONFIG_SECTION_STANZA
CONFIG_KEY_USER CONFIG_KEY_HOST CONFIG_KEY_PATH CONFIG_KEY_USER CONFIG_KEY_HOST CONFIG_KEY_PATH
@ -108,7 +109,7 @@ use constant
CONFIG_SECTION_LOG => 'log', CONFIG_SECTION_LOG => 'log',
CONFIG_SECTION_BACKUP => 'backup', CONFIG_SECTION_BACKUP => 'backup',
CONFIG_SECTION_RESTORE => 'restore', CONFIG_SECTION_RESTORE => 'restore',
CONFIG_SECTION_RESTORE_REMAP => 'restore:remap', CONFIG_SECTION_TABLESPACE_MAP => 'tablespace:map',
CONFIG_SECTION_ARCHIVE => 'archive', CONFIG_SECTION_ARCHIVE => 'archive',
CONFIG_SECTION_RETENTION => 'retention', CONFIG_SECTION_RETENTION => 'retention',
CONFIG_SECTION_STANZA => 'stanza', CONFIG_SECTION_STANZA => 'stanza',
@ -266,6 +267,18 @@ sub config_load
test_set(param_get(PARAM_TEST), param_get(PARAM_TEST_DELAY)); test_set(param_get(PARAM_TEST), param_get(PARAM_TEST_DELAY));
} }
####################################################################################################################################
# CONFIG_STANZA_SECTION_LOAD - Get an entire stanza section
####################################################################################################################################
sub config_section_load
{
my $strSection = shift;
$strSection = param_get(PARAM_STANZA) . ':' . $strSection;
return $oConfig{$strSection};
}
#################################################################################################################################### ####################################################################################################################################
# CONFIG_KEY_LOAD - Get a value from the config and be sure that it is defined (unless bRequired is false) # CONFIG_KEY_LOAD - Get a value from the config and be sure that it is defined (unless bRequired is false)
#################################################################################################################################### ####################################################################################################################################

14
lib/BackRest/Manifest.pm
View File

@ -343,6 +343,12 @@ sub valid
my $strPath = (split(':', $strSection))[0]; my $strPath = (split(':', $strSection))[0];
my $strType = (split(':', $strSection))[1]; my $strType = (split(':', $strSection))[1];
if ($strPath eq 'tablespace')
{
$strPath = (split(':', $strSection))[1];
$strType = (split(':', $strSection))[2];
}
if (($strType eq 'path' || $strType eq 'file' || $strType eq 'link') && if (($strType eq 'path' || $strType eq 'file' || $strType eq 'link') &&
($strSubKey eq MANIFEST_SUBKEY_USER || ($strSubKey eq MANIFEST_SUBKEY_USER ||
$strSubKey eq MANIFEST_SUBKEY_GROUP)) $strSubKey eq MANIFEST_SUBKEY_GROUP))
@ -398,6 +404,14 @@ sub valid
return true; return true;
} }
} }
elsif ($strSection eq MANIFEST_SECTION_BACKUP_TABLESPACE)
{
if ($strSubKey eq 'link' ||
$strSubKey eq 'path')
{
return true;
}
}
elsif ($strSection eq MANIFEST_SECTION_BACKUP_PATH) elsif ($strSection eq MANIFEST_SECTION_BACKUP_PATH)
{ {
if ($strKey eq 'base' || $strKey =~ /^tablespace\:.*$/) if ($strKey eq 'base' || $strKey =~ /^tablespace\:.*$/)

80
lib/BackRest/Restore.pm
View File

@ -187,50 +187,35 @@ sub manifest_load
' - this indicates some sort of corruption (at the very least paths have been renamed.'); ' - this indicates some sort of corruption (at the very least paths have been renamed.');
} }
if ($self->{strDbClusterPath} ne $oManifest->set(MANIFEST_SECTION_BACKUP_PATH, MANIFEST_KEY_BASE)) if ($self->{strDbClusterPath} ne $oManifest->get(MANIFEST_SECTION_BACKUP_PATH, MANIFEST_KEY_BASE))
{ {
&log(INFO, 'base path remapped to ' . $self->{strDbClusterPath}); &log(INFO, 'base path remapped to ' . $self->{strDbClusterPath});
$oManifest->set(MANIFEST_SECTION_BACKUP_PATH, MANIFEST_KEY_BASE, undef, $self->{strDbClusterPath}); $oManifest->set(MANIFEST_SECTION_BACKUP_PATH, MANIFEST_KEY_BASE, undef, $self->{strDbClusterPath});
} }
# # If tablespaces have been remapped, update the manifest # If tablespaces have been remapped, update the manifest
# if (defined($self->{oRemapRef})) if (defined($self->{oRemapRef}))
# { {
# foreach my $strPathKey (sort(keys $self->{oRemapRef})) foreach my $strPathKey (sort(keys $self->{oRemapRef}))
# { {
# my $strRemapPath = ${$self->{oRemapRef}}{$strPathKey}; my $strRemapPath = ${$self->{oRemapRef}}{$strPathKey};
#
# if ($strPathKey eq 'base') # Make sure that the tablespace exists in the manifest
# { if (!$oManifest->test(MANIFEST_SECTION_BACKUP_TABLESPACE, $strPathKey))
# &log(INFO, "remapping base to ${strRemapPath}"); {
# $oManifest->set(MANIFEST_SECTION_BACKUP_PATH, $strPathKey, undef, $strRemapPath); confess &log(ERROR, "cannot remap invalid tablespace ${strPathKey} to ${strRemapPath}");
# } }
# else
# { # Remap the tablespace in the manifest
# # If the tablespace begins with prefix 'tablespace:' then strip the prefix. This only needs to be used in &log(INFO, "remapping tablespace ${strPathKey} to ${strRemapPath}");
# # the case that there is a tablespace called 'base'
# if (index($strPathKey, 'tablespace:') == 0) my $strTablespaceLink = $oManifest->get(MANIFEST_SECTION_BACKUP_TABLESPACE, $strPathKey, MANIFEST_SUBKEY_LINK);
# {
# $strPathKey = substr($strPathKey, length('tablespace:')); $oManifest->set(MANIFEST_SECTION_BACKUP_PATH, "tablespace:${strPathKey}", undef, $strRemapPath);
# } $oManifest->set(MANIFEST_SECTION_BACKUP_TABLESPACE, $strPathKey, MANIFEST_SUBKEY_PATH, $strRemapPath);
# $oManifest->set('base:link', "pg_tblspc/${strTablespaceLink}", MANIFEST_SUBKEY_DESTINATION, $strRemapPath);
# # Make sure that the tablespace exists in the manifest }
# if (!$oManifest->test(MANIFEST_SECTION_BACKUP_TABLESPACE, $strPathKey)) }
# {
# confess &log(ERROR, "cannot remap invalid tablespace ${strPathKey} to ${strRemapPath}");
# }
#
# # Remap the tablespace in the manifest
# &log(INFO, "remapping tablespace to ${strRemapPath}");
#
# my $strTablespaceLink = $oManifest->get(MANIFEST_SECTION_BACKUP_TABLESPACE, $strPathKey, MANIFEST_SUBKEY_LINK);
#
# $oManifest->set(MANIFEST_SECTION_BACKUP_PATH, "tablespace:${strPathKey}", undef, $strRemapPath);
# $oManifest->set(MANIFEST_SECTION_BACKUP_TABLESPACE, $strPathKey, MANIFEST_SUBKEY_PATH, $strRemapPath);
# $oManifest->set('base:link', "pg_tblspc/${strTablespaceLink}", MANIFEST_SUBKEY_DESTINATION, $strRemapPath);
# }
# }
# }
$self->manifest_ownership_check($oManifest); $self->manifest_ownership_check($oManifest);
@ -411,15 +396,18 @@ sub build
# Create all links in the manifest that do not already exist # Create all links in the manifest that do not already exist
$strSection = "${strSectionPathKey}:link"; $strSection = "${strSectionPathKey}:link";
foreach my $strName ($oManifest->keys($strSection)) if ($oManifest->test($strSection))
{ {
my $strLink = "${strSectionPath}/${strName}"; foreach my $strName ($oManifest->keys($strSection))
if (!$self->{oFile}->exists(PATH_DB_ABSOLUTE, $strLink))
{ {
$self->{oFile}->link_create(PATH_DB_ABSOLUTE, my $strLink = "${strSectionPath}/${strName}";
$oManifest->get($strSection, $strName, MANIFEST_SUBKEY_DESTINATION),
PATH_DB_ABSOLUTE, $strLink); if (!$self->{oFile}->exists(PATH_DB_ABSOLUTE, $strLink))
{
$self->{oFile}->link_create(PATH_DB_ABSOLUTE,
$oManifest->get($strSection, $strName, MANIFEST_SUBKEY_DESTINATION),
PATH_DB_ABSOLUTE, $strLink);
}
} }
} }
} }

60
test/lib/BackRestTest/BackupTest.pm
View File

@ -184,12 +184,14 @@ sub BackRestTestBackup_Create
# Create the db paths # Create the db paths
BackRestTestCommon_PathCreate(BackRestTestCommon_DbPathGet()); BackRestTestCommon_PathCreate(BackRestTestCommon_DbPathGet());
BackRestTestCommon_PathCreate(BackRestTestCommon_DbCommonPathGet()); BackRestTestCommon_PathCreate(BackRestTestCommon_DbCommonPathGet());
BackRestTestCommon_PathCreate(BackRestTestCommon_DbCommonPathGet() . '2'); BackRestTestCommon_PathCreate(BackRestTestCommon_DbCommonPathGet(2));
# Create tablespace paths # Create tablespace paths
BackRestTestCommon_PathCreate(BackRestTestCommon_DbTablespacePathGet()); BackRestTestCommon_PathCreate(BackRestTestCommon_DbTablespacePathGet());
BackRestTestCommon_PathCreate(BackRestTestCommon_DbTablespacePathGet() . '/ts1'); BackRestTestCommon_PathCreate(BackRestTestCommon_DbTablespacePathGet(1));
BackRestTestCommon_PathCreate(BackRestTestCommon_DbTablespacePathGet() . '/ts2'); BackRestTestCommon_PathCreate(BackRestTestCommon_DbTablespacePathGet(1, 2));
BackRestTestCommon_PathCreate(BackRestTestCommon_DbTablespacePathGet(2));
BackRestTestCommon_PathCreate(BackRestTestCommon_DbTablespacePathGet(2, 2));
# Create the archive directory # Create the archive directory
BackRestTestCommon_PathCreate(BackRestTestCommon_ArchivePathGet()); BackRestTestCommon_PathCreate(BackRestTestCommon_ArchivePathGet());
@ -319,13 +321,13 @@ sub BackRestTestBackup_ManifestTablespaceCreate
my $strMode = shift; my $strMode = shift;
# Create final file location # Create final file location
my $strPath = BackRestTestCommon_DbPathGet() . "/ts${iOid}"; my $strPath = BackRestTestCommon_DbTablespacePathGet($iOid);
# Create the path # Create the path
if (!(-e $strPath)) # if (!(-e $strPath))
{ # {
BackRestTestCommon_PathCreate($strPath, $strMode); # BackRestTestCommon_PathCreate($strPath, $strMode);
} # }
# Stat the path # Stat the path
my $oStat = lstat($strPath); my $oStat = lstat($strPath);
@ -1181,14 +1183,6 @@ sub BackRestTestBackup_Test
# Create tablespace path # Create tablespace path
BackRestTestBackup_ManifestPathCreate(\%oManifest, 'base', 'pg_tblspc'); BackRestTestBackup_ManifestPathCreate(\%oManifest, 'base', 'pg_tblspc');
# for (my $iTablespaceIdx = 1; $iTablespaceIdx <= $iTablespaceTotal; $iTablespaceIdx++)
# {
# BackRestTestBackup_ManifestTablespaceCreate(\%oManifest, $iTablespaceIdx);
#
# BackRestTestBackup_ManifestFileCreate(\%oManifest, "tablespace:${iTablespaceIdx}", 'tablespace1.txt', 'TBLSPC',
# $bChecksum ? '44ad0bf042936c576c75891d0e5ded8e2b60fb54' : undef, $lTime);
# }
# Create db config # Create db config
BackRestTestCommon_ConfigCreate('db', # local BackRestTestCommon_ConfigCreate('db', # local
$bRemote ? BACKUP : undef, # remote $bRemote ? BACKUP : undef, # remote
@ -1263,25 +1257,19 @@ sub BackRestTestBackup_Test
$strType = 'incr'; $strType = 'incr';
BackRestTestBackup_ManifestReference(\%oManifest, $strFullBackup); BackRestTestBackup_ManifestReference(\%oManifest, $strFullBackup);
# Actually do add tablespace here # Add tablespace 1
BackRestTestBackup_ManifestTablespaceCreate(\%oManifest, 1);
BackRestTestBackup_ManifestFileCreate(\%oManifest, "tablespace:1", 'tablespace1.txt', 'TBLSPC',
$bChecksum ? '44ad0bf042936c576c75891d0e5ded8e2b60fb54' : undef, $lTime);
my $strBackup = BackRestTestBackup_Backup($strType, $strStanza, $bRemote, $oFile, \%oManifest, 'add tablespace 1'); my $strBackup = BackRestTestBackup_Backup($strType, $strStanza, $bRemote, $oFile, \%oManifest, 'add tablespace 1');
# Restore -
#-----------------------------------------------------------------------------------------------------------------------
$bDelta = false;
# Remap the base path
my %oRemapHash;
$oRemapHash{base} = BackRestTestCommon_DbCommonPathGet . '2';
BackRestTestBackup_Restore($oFile, $strFullBackup, $strStanza, \%oManifest, \%oRemapHash, $bDelta, $bForce,
'remap base path');
# Resume Incr Backup # Resume Incr Backup
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------
$strType = 'incr'; $strType = 'incr';
BackRestTestBackup_ManifestReference(\%oManifest, $strFullBackup); # BackRestTestBackup_ManifestReference(\%oManifest, $strFullBackup);
$strTmpPath = BackRestTestCommon_BackupPathGet() . "/temp/${strStanza}.tmp"; $strTmpPath = BackRestTestCommon_BackupPathGet() . "/temp/${strStanza}.tmp";
@ -1294,7 +1282,7 @@ sub BackRestTestBackup_Test
# Resume Diff Backup # Resume Diff Backup
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------
$strType = 'diff'; $strType = 'diff';
BackRestTestBackup_ManifestReference(\%oManifest, $strFullBackup); # BackRestTestBackup_ManifestReference(\%oManifest, $strFullBackup);
$strTmpPath = BackRestTestCommon_BackupPathGet() . "/temp/${strStanza}.tmp"; $strTmpPath = BackRestTestCommon_BackupPathGet() . "/temp/${strStanza}.tmp";
@ -1304,6 +1292,18 @@ sub BackRestTestBackup_Test
$strBackup = BackRestTestBackup_Backup($strType, $strStanza, $bRemote, $oFile, \%oManifest, $strBackup = BackRestTestBackup_Backup($strType, $strStanza, $bRemote, $oFile, \%oManifest,
'resume - fail', TEST_BACKUP_NORESUME); 'resume - fail', TEST_BACKUP_NORESUME);
# Restore -
#-----------------------------------------------------------------------------------------------------------------------
$bDelta = false;
# Remap the base path
my %oRemapHash;
$oRemapHash{base} = BackRestTestCommon_DbCommonPathGet(2);
# $oRemapHash{1} = BackRestTestCommon_DbTablespacePathGet(1, 2);
BackRestTestBackup_Restore($oFile, $strFullBackup, $strStanza, \%oManifest, \%oRemapHash, $bDelta, $bForce,
'remap base path');
# Incr Backup # Incr Backup
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------
$strType = 'incr'; $strType = 'incr';

22
test/lib/BackRestTest/CommonTest.pm
View File

@ -23,6 +23,7 @@ use lib dirname($0) . '/../lib';
use BackRest::Utility; use BackRest::Utility;
use BackRest::Remote; use BackRest::Remote;
use BackRest::File; use BackRest::File;
use BackRest::Manifest;
use Exporter qw(import); use Exporter qw(import);
our @EXPORT = qw(BackRestTestCommon_Setup BackRestTestCommon_ExecuteBegin BackRestTestCommon_ExecuteEnd our @EXPORT = qw(BackRestTestCommon_Setup BackRestTestCommon_ExecuteBegin BackRestTestCommon_ExecuteEnd
@ -431,14 +432,20 @@ sub BackRestTestCommon_ConfigRemap
foreach my $strRemap (sort(keys $oRemapHashRef)) foreach my $strRemap (sort(keys $oRemapHashRef))
{ {
my $strRemapPath = ${$oRemapHashRef}{$strRemap};
if ($strRemap eq 'base') if ($strRemap eq 'base')
{ {
$oConfig{$strStanza}{path} = ${$oRemapHashRef}{$strRemap}; $oConfig{$strStanza}{path} = $strRemapPath;
${$oManifestRef}{'backup:path'}{base} = ${$oRemapHashRef}{$strRemap}; ${$oManifestRef}{'backup:path'}{base} = $strRemapPath;
} }
else else
{ {
confess " not coded yet"; $oConfig{"${strStanza}:tablespace:map"}{$strRemap} = $strRemapPath;
${$oManifestRef}{'backup:path'}{"tablespace:${strRemap}"} = $strRemapPath;
${$oManifestRef}{'backup:tablespace'}{$strRemap}{'path'} = $strRemapPath;
${$oManifestRef}{'base:link'}{"pg_tblspc/${strRemap}"}{'link_destination'} = $strRemapPath;
} }
} }
@ -630,12 +637,17 @@ sub BackRestTestCommon_DbPathGet
sub BackRestTestCommon_DbCommonPathGet sub BackRestTestCommon_DbCommonPathGet
{ {
return $strCommonDbCommonPath; my $iIndex = shift;
return $strCommonDbCommonPath . (defined($iIndex) ? "-${iIndex}" : '');
} }
sub BackRestTestCommon_DbTablespacePathGet sub BackRestTestCommon_DbTablespacePathGet
{ {
return $strCommonDbTablespacePath; my $iTablespace = shift;
my $iIndex = shift;
return $strCommonDbTablespacePath . (defined($iTablespace) ? "/ts${iTablespace}" . (defined($iIndex) ? "-${iIndex}" : '') : '');
} }
sub BackRestTestCommon_DbPortGet sub BackRestTestCommon_DbPortGet