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

Restore as root is now working.

Browse Source
This commit is contained in:
David Steele 2014-12-31 11:20:46 -05:00
parent 0805055d4b
commit 7e083e8749
2 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/BackRest/File.pm
View File

@ -1216,7 +1216,7 @@ sub copy
', modification_time = ' . (defined($lModificationTime) ? $lModificationTime : '[undef]') . ', modification_time = ' . (defined($lModificationTime) ? $lModificationTime : '[undef]') .
', mode = ' . (defined($strMode) ? $strMode : '[undef]') . ', mode = ' . (defined($strMode) ? $strMode : '[undef]') .
', user = ' . (defined($strUser) ? $strUser : '[undef]') . ', user = ' . (defined($strUser) ? $strUser : '[undef]') .
', group = ' . (defined($strGroup) ? $strUser : '[undef]'); ', group = ' . (defined($strGroup) ? $strGroup : '[undef]');
&log(DEBUG, OP_FILE_COPY . ": ${strDebug}"); &log(DEBUG, OP_FILE_COPY . ": ${strDebug}");
# Open the source and destination files (if needed) # Open the source and destination files (if needed)
@ -1435,8 +1435,16 @@ sub copy
return false; return false;
} }
# Otherwise report the error # Otherwise report the error. I don't like this method of error reporting - raising the exception object makes the
confess $oMessage; # error hard to interpret and hides the error stack, raising test loses the error code.
if ($oMessage->isa('BackRest::Exception'))
{
confess $oMessage->message();
}
else
{
confess $oMessage;
}
} }
# If this was a remote copy, then return the result # If this was a remote copy, then return the result
@ -1499,8 +1507,21 @@ sub copy
# if user or group is defined # if user or group is defined
if (defined($strUser) || defined($strGroup)) if (defined($strUser) || defined($strGroup))
{ {
chown(defined($strUser) ? getpwnam($strUser) : $<, my $iUserId;
defined($strGroup) ? getgrnam($strGroup) : $(, my $iGroupId;
if (defined($strUser))
{
$iUserId = getpwnam($strUser);
}
if (defined($strGroup))
{
$iGroupId = getgrnam($strGroup);
}
chown(defined($iUserId) ? $iUserId : $<,
defined($iGroupId) ? $iGroupId : $(,
$strDestinationTmpOp); $strDestinationTmpOp);
} }

57
lib/BackRest/Restore.pm
View File

@ -56,12 +56,12 @@ sub new
} }
#################################################################################################################################### ####################################################################################################################################
# MANIFEST_OWNERSHIP_TEST # MANIFEST_OWNERSHIP_CHECK
# #
# Checks the users and groups that exist in the manifest and emits warnings for ownership that cannot be set properly, either # Checks the users and groups that exist in the manifest and emits warnings for ownership that cannot be set properly, either
# because the current user does not have permissions or because the user/group does not exist. # because the current user does not have permissions or because the user/group does not exist.
#################################################################################################################################### ####################################################################################################################################
sub manifest_ownership_test sub manifest_ownership_check
{ {
my $self = shift; # Class hash my $self = shift; # Class hash
my $oManifestRef = shift; # Backup manifest my $oManifestRef = shift; # Backup manifest
@ -76,13 +76,13 @@ sub manifest_ownership_test
my %oFileTypeHash = ('path' => true, 'link' => true, 'file' => true); my %oFileTypeHash = ('path' => true, 'link' => true, 'file' => true);
my %oOwnerTypeHash = ('user' => $strDefaultUser, 'group' => $strDefaultGroup); my %oOwnerTypeHash = ('user' => $strDefaultUser, 'group' => $strDefaultGroup);
# Loop through owner types # Loop through owner types (user, group)
foreach my $strOwnerType (sort (keys %oOwnerTypeHash)) foreach my $strOwnerType (sort (keys %oOwnerTypeHash))
{ {
# Loop through all backup paths # Loop through all backup paths (base and tablespaces)
foreach my $strPathKey (sort(keys ${$oManifestRef}{'backup:path'})) foreach my $strPathKey (sort(keys ${$oManifestRef}{'backup:path'}))
{ {
# Loop through types # Loop through types (path, link, file)
foreach my $strFileType (sort (keys %oFileTypeHash)) foreach my $strFileType (sort (keys %oFileTypeHash))
{ {
# Get users and groups for paths # Get users and groups for paths
@ -96,8 +96,18 @@ sub manifest_ownership_test
# If the owner has not been tested yet then test it # If the owner has not been tested yet then test it
if (!defined($oOwnerHash{$strOwnerType}{$strOwner})) if (!defined($oOwnerHash{$strOwnerType}{$strOwner}))
{ {
$oOwnerHash{$strOwnerType}{$strOwner} = ($strOwnerType eq 'user' && defined(getpwnam($strOwner))) || my $strOwnerId;
($strOwnerType eq 'group' && defined(getpwnam($strOwner)));
if ($strOwnerType eq 'user')
{
$strOwnerId = getpwnam($strOwner);
}
else
{
$strOwnerId = getgrnam($strOwner);
}
$oOwnerHash{$strOwnerType}{$strOwner} = defined($strOwnerId) ? true : false;
} }
if (!$oOwnerHash{$strOwnerType}{$strOwner}) if (!$oOwnerHash{$strOwnerType}{$strOwner})
@ -123,8 +133,11 @@ sub manifest_ownership_test
# Output warning for any invalid owners # Output warning for any invalid owners
foreach my $strOwner (sort (keys $oOwnerHash{$strOwnerType})) foreach my $strOwner (sort (keys $oOwnerHash{$strOwnerType}))
{ {
&log(WARN, "${strOwnerType} ${strOwner} " . ($< == 0 ? "does not exist" : "cannot be set") . if (!$oOwnerHash{$strOwnerType}{$strOwner})
", changed to $oOwnerTypeHash{$strOwnerType}"); {
&log(WARN, "${strOwnerType} ${strOwner} " . ($< == 0 ? "does not exist" : "cannot be set") .
", changed to $oOwnerTypeHash{$strOwnerType}");
}
} }
} }
} }
@ -206,7 +219,7 @@ sub manifest_load
confess &log(ERROR, 'backup ' . $self->{strBackupPath} . ' does not exist'); confess &log(ERROR, 'backup ' . $self->{strBackupPath} . ' does not exist');
} }
$self->manifest_ownership_test($oManifestRef); $self->manifest_ownership_check($oManifestRef);
} }
#################################################################################################################################### ####################################################################################################################################
@ -486,26 +499,6 @@ sub restore_thread
} }
# Set user and group if running as root (otherwise current user and group will be used for restore) # Set user and group if running as root (otherwise current user and group will be used for restore)
my $strUser = undef;
my $strGroup = undef;
if ($< == 0)
{
$strUser = ${$oManifestRef}{$strSection}{$strName}{user};
if (!defined(getpwnam($strUser)))
{
$strUser = $strCurrentUser;
}
$strGroup = ${$oManifestRef}{$strSection}{$strName}{group};
if (!defined(getgrnam($strGroup)))
{
$strGroup = $strCurrentGroup;
}
}
# Copy the file from the backup to the database # Copy the file from the backup to the database
$oFileThread->copy(PATH_BACKUP_CLUSTER, (defined($strReference) ? $strReference : $self->{strBackupPath}) . $oFileThread->copy(PATH_BACKUP_CLUSTER, (defined($strReference) ? $strReference : $self->{strBackupPath}) .
"/${strSourcePath}/${strName}" . "/${strSourcePath}/${strName}" .
@ -515,7 +508,9 @@ sub restore_thread
undef, undef, undef, undef,
${$oManifestRef}{$strSection}{$strName}{modification_time}, ${$oManifestRef}{$strSection}{$strName}{modification_time},
${$oManifestRef}{$strSection}{$strName}{permission}, ${$oManifestRef}{$strSection}{$strName}{permission},
$strUser, $strGroup); undef,
${$oManifestRef}{$strSection}{$strName}{user},
${$oManifestRef}{$strSection}{$strName}{group});
} }
# Even number threads move up when they have finished a queue, odd numbered threads move down # Even number threads move up when they have finished a queue, odd numbered threads move down