Skip to content
Permalink
Browse files

Release of version 1.3.2

Fix for handling --skip-xlog together with remote destinations (-dr) in
omnipitr-backup-*. Bug reported
(#13) by Otto Bretz

The problem was that remote delivery subrouting was not checking for
skip-xlogs, and relivered all types of files (checksums, data, xlogs) even
if xlog was not present.
  • Loading branch information...
depesz committed Dec 22, 2013
1 parent 1c6d225 commit b5f551fd112054965e1549058829ade26df42e11
Showing with 48 additions and 34 deletions.
  1. +2 −2 META.json
  2. +12 −0 doc/changes.pod
  3. +1 −1 lib/OmniPITR/Log.pm
  4. +1 −1 lib/OmniPITR/Program.pm
  5. +1 −1 lib/OmniPITR/Program/Archive.pm
  6. +5 −3 lib/OmniPITR/Program/Backup.pm
  7. +1 −1 lib/OmniPITR/Program/Backup/Cleanup.pm
  8. +1 −1 lib/OmniPITR/Program/Backup/Master.pm
  9. +1 −1 lib/OmniPITR/Program/Backup/Slave.pm
  10. +1 −1 lib/OmniPITR/Program/Checksum.pm
  11. +1 −1 lib/OmniPITR/Program/Cleanup.pm
  12. +1 −1 lib/OmniPITR/Program/Monitor.pm
  13. +1 −1 lib/OmniPITR/Program/Monitor/Check.pm
  14. +1 −1 lib/OmniPITR/Program/Monitor/Check/Archive_Queue.pm
  15. +1 −1 lib/OmniPITR/Program/Monitor/Check/Current_Archive_Time.pm
  16. +1 −1 lib/OmniPITR/Program/Monitor/Check/Current_Restore_Time.pm
  17. +1 −1 lib/OmniPITR/Program/Monitor/Check/Dump_State.pm
  18. +1 −1 lib/OmniPITR/Program/Monitor/Check/Errors.pm
  19. +1 −1 lib/OmniPITR/Program/Monitor/Check/Last_Archive_Age.pm
  20. +1 −1 lib/OmniPITR/Program/Monitor/Check/Last_Backup_Age.pm
  21. +1 −1 lib/OmniPITR/Program/Monitor/Check/Last_Restore_Age.pm
  22. +1 −1 lib/OmniPITR/Program/Monitor/Parser.pm
  23. +1 −1 lib/OmniPITR/Program/Monitor/Parser/Archive.pm
  24. +1 −1 lib/OmniPITR/Program/Monitor/Parser/Backup.pm
  25. +1 −1 lib/OmniPITR/Program/Monitor/Parser/Backup_Master.pm
  26. +1 −1 lib/OmniPITR/Program/Monitor/Parser/Backup_Slave.pm
  27. +1 −1 lib/OmniPITR/Program/Monitor/Parser/Restore.pm
  28. +1 −1 lib/OmniPITR/Program/Restore.pm
  29. +1 −1 lib/OmniPITR/Program/Synch.pm
  30. +1 −1 lib/OmniPITR/Tools.pm
  31. +1 −1 lib/OmniPITR/Tools/CommandPiper.pm
  32. +1 −1 lib/OmniPITR/Tools/ParallelSystem.pm
@@ -2,7 +2,7 @@
"name": "omnipitr",
"abstract": "Advanced WAL File / Backup Management Tools",
"description": "OmniPITR provides a set of tools for managing PITR, including archive_commands, restore_commands, and creating backups from either the master or slave server",
"version": "1.3.1",
"version": "1.3.2",
"maintainer": "Robert Treat <rob@xzilla.net>",
"license": "postgresql",
"release_status": "stable",
@@ -32,7 +32,7 @@
"abstract": "Advanced WAL File / Backup Management Tools",
"file": "bin/omnipitr-archive",
"docfile": "doc/howto.pod",
"version": "1.3.1"
"version": "1.3.2"
}
}
}
@@ -2,6 +2,18 @@

=encoding utf8

=head2 2013-12-22

=over

=item * Release of version 1.3.2

=item * Fix for handling --skip-xlog together with remote destinations (-dr)
in omnipitr-backup-*. Bug reported
(https://github.com/omniti-labs/omnipitr/issues/13) by Otto Bretz

=back

=head2 2013-12-17

=over
@@ -9,7 +9,7 @@ use Data::Dumper;
use POSIX qw(strftime floor);
use IO::File;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';

BEGIN {
eval { use Time::HiRes qw( time ); };
@@ -15,7 +15,7 @@ use Pod::Usage;
use Sys::Hostname;
use Carp;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';

=head1 new()
@@ -2,7 +2,7 @@ package OmniPITR::Program::Archive;
use strict;
use warnings;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program );

use Carp;
@@ -2,7 +2,7 @@ package OmniPITR::Program::Backup;
use strict;
use warnings;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program );

use Config;
@@ -143,7 +143,7 @@ sub deliver_metadata_file {

for my $dst ( @{ $self->{ 'destination' }->{ 'remote' } } ) {
my $base_filename = $self->get_archive_filename( 'meta', $dst->{ 'compression' } );
if ( !$saved{ $dst - { 'compression' } } ) {
if ( !$saved{ $dst->{ 'compression' } } ) {
my $temp_file_path = $self->temp_file( $base_filename );
$saved{ $dst->{ 'compression' } } = $temp_file_path;
if ( open my $fh, '>', $temp_file_path ) {
@@ -436,7 +436,9 @@ sub deliver_to_all_remote_destinations {

my $B = $self->{ 'base' }->{ $dst->{ 'compression' } }->[ 0 ]->{ 'path' };

for my $type ( ( @{ $self->{ 'digests' } }, qw( data xlog ) ) ) {
my @types_to_transfer = ( @{ $self->{ 'digests' } }, 'data' );
push @types_to_transfer, 'xlog' unless $self->{ 'skip-xlogs' };
for my $type ( @types_to_transfer ) {

my $filename = $self->get_archive_filename( $type, $dst->{ 'compression' } );
my $source_filename = File::Spec->catfile( $B, $filename );
@@ -2,7 +2,7 @@ package OmniPITR::Program::Backup::Cleanup;
use strict;
use warnings;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program );

use Carp;
@@ -2,7 +2,7 @@ package OmniPITR::Program::Backup::Master;
use strict;
use warnings;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Backup );

use Carp;
@@ -2,7 +2,7 @@ package OmniPITR::Program::Backup::Slave;
use strict;
use warnings;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Backup );

use File::Spec;
@@ -2,7 +2,7 @@ package OmniPITR::Program::Checksum;
use strict;
use warnings;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program );

use Carp;
@@ -2,7 +2,7 @@ package OmniPITR::Program::Cleanup;
use strict;
use warnings;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program );

use Carp;
@@ -2,7 +2,7 @@ package OmniPITR::Program::Monitor;
use strict;
use warnings;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program );

use Carp;
@@ -4,7 +4,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';

=head1 NAME
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Check );

use Data::Dumper;
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Check );

use Time::HiRes qw( time );
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Check );

use Time::HiRes qw( time );
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Check );

use Data::Dumper;
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Check );

use Getopt::Long qw( :config no_ignore_case );
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Check );

use Time::HiRes qw( time );
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Check );

use Time::HiRes qw( time );
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Check );

use Time::HiRes qw( time );
@@ -5,7 +5,7 @@ use Carp;
use Data::Dumper;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';

=head1 NAME
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Parser );

=head1 Parser/Archvie state data structure
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Parser );

=head1 Backup_Slave/Backup_Master *base* state data structure
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Parser::Backup );

1;
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Parser::Backup );

1;
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use English qw( -no_match_vars );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program::Monitor::Parser );

=head1 Parser/Restore state data structure
@@ -2,7 +2,7 @@ package OmniPITR::Program::Restore;
use strict;
use warnings;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program );

use Carp;
@@ -2,7 +2,7 @@ package OmniPITR::Program::Synch;
use strict;
use warnings;

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
use base qw( OmniPITR::Program );

use Carp qw( croak );
@@ -7,7 +7,7 @@ use Digest::MD5;
use File::Temp qw( tempfile );
use base qw( Exporter );

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';
our @EXPORT_OK = qw( file_md5sum run_command ext_for_compression );
our %EXPORT_TAGS = ( 'all' => \@EXPORT_OK );

@@ -12,7 +12,7 @@ OmniPITR::Tools::CommandPiper - Class for building complex pipe-based shell comm
=cut

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';

=head1 SYNOPSIS
@@ -13,7 +13,7 @@ OmniPITR::Tools::ParallelSystem - Class for running multiple shell commands in p
=cut

our $VERSION = '1.3.1';
our $VERSION = '1.3.2';

=head1 SYNOPSIS

0 comments on commit b5f551f

Please sign in to comment.
You can’t perform that action at this time.