diff --git a/bin/pg_backrest.pl b/bin/pg_backrest.pl index b93c660c1..deda32aef 100755 --- a/bin/pg_backrest.pl +++ b/bin/pg_backrest.pl @@ -350,6 +350,7 @@ if ($strOperation eq OP_ARCHIVE_PUSH || $strOperation eq OP_ARCHIVE_PULL) undef, $oFile, undef, + $bCompress, undef, !$bChecksum ); @@ -421,6 +422,7 @@ if ($strOperation eq OP_ARCHIVE_PUSH || $strOperation eq OP_ARCHIVE_PULL) undef, $oFile, undef, + $bCompress, undef, !$bChecksum, config_load(CONFIG_SECTION_BACKUP, CONFIG_KEY_THREAD_MAX), @@ -459,6 +461,7 @@ if ($strOperation eq OP_ARCHIVE_PUSH || $strOperation eq OP_ARCHIVE_PULL) undef, $oFile, undef, + $bCompress, undef, !$bChecksum, config_load(CONFIG_SECTION_BACKUP, CONFIG_KEY_THREAD_MAX), @@ -553,6 +556,7 @@ backup_init $oDb, $oFile, $strType, + config_load(CONFIG_SECTION_BACKUP, CONFIG_KEY_COMPRESS, true, "y") eq "y" ? true : false, config_load(CONFIG_SECTION_BACKUP, CONFIG_KEY_HARDLINK, true, "n") eq "y" ? true : false, !$bChecksum, config_load(CONFIG_SECTION_BACKUP, CONFIG_KEY_THREAD_MAX), diff --git a/lib/BackRest/Backup.pm b/lib/BackRest/Backup.pm index a025c438c..ff065f3f4 100644 --- a/lib/BackRest/Backup.pm +++ b/lib/BackRest/Backup.pm @@ -28,8 +28,8 @@ our @EXPORT = qw(backup_init backup_thread_kill archive_push archive_pull archiv my $oDb; my $oFile; my $strType = "incremental"; # Type of backup: full, differential (diff), incremental (incr) +my $bCompress; my $bHardLink; -my $bCompress = true; my $bNoChecksum; my $iThreadMax; my $iThreadLocalMax; @@ -52,6 +52,7 @@ sub backup_init my $oDbParam = shift; my $oFileParam = shift; my $strTypeParam = shift; + my $bCompressParam = shift; my $bHardLinkParam = shift; my $bNoChecksumParam = shift; my $iThreadMaxParam = shift; @@ -61,6 +62,7 @@ sub backup_init $oDb = $oDbParam; $oFile = $oFileParam; $strType = $strTypeParam; + $bCompress = $bCompressParam; $bHardLink = $bHardLinkParam; $bNoChecksum = $bNoChecksumParam; $iThreadMax = $iThreadMaxParam; @@ -288,7 +290,7 @@ sub archive_push $oFile->copy(PATH_DB_ABSOLUTE, $strSourceFile, # Source file PATH_BACKUP_ARCHIVE, $strDestinationFile, # Destination file false, # Source is not compressed - false, # !!! For now, compress destination + $bCompress, # Destination compress is configurable undef, undef, undef, # Unused params true); # Create path if it does not exist } @@ -1392,7 +1394,7 @@ sub backup $oFile->copy(PATH_BACKUP_ARCHIVE, $stryArchiveFile[0], PATH_BACKUP_TMP, "base/pg_xlog/${strArchive}", $stryArchiveFile[0] =~ "^.*\.$oFile->{strCompressExtension}\$", - false); # !!! THIS NEEDS TO BE FIXED + $bCompress); } }