- fixed configure.pl and makeDist.

[BackupPC.git] / lib / BackupPC / Xfer / Rsync.pm

diff --git a/lib/BackupPC/Xfer/Rsync.pm b/lib/BackupPC/Xfer/Rsync.pm
index f0350c9..8972a98 100644 (file)
--- a/lib/BackupPC/Xfer/Rsync.pm
+++ b/lib/BackupPC/Xfer/Rsync.pm
@@ -11,7 +11,7 @@
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT

-#   Copyright (C) 2002  Craig Barratt
+#   Copyright (C) 2002-2003  Craig Barratt

 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by


@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
 #
 #========================================================================
 #

-# Version 2.0.0beta3, released 1 Jun 2003.
+# Version 3.0.0alpha, released 23 Jan 2006.

 #
 # See http://backuppc.sourceforge.net.
 #
 #
 # See http://backuppc.sourceforge.net.
 #


@@ -52,9 +52,13 @@ BEGIN {
         $RsyncLibOK = 0;
         $RsyncLibErr = "File::RsyncP module doesn't exist";
     } else {
         $RsyncLibOK = 0;
         $RsyncLibErr = "File::RsyncP module doesn't exist";
     } else {

-        if ( $File::RsyncP::VERSION < 0.41 ) {
+       #
+       # Note: also update configure.pl when this version number is changed!
+       #
+        if ( $File::RsyncP::VERSION < 0.52 ) {

             $RsyncLibOK = 0;
             $RsyncLibOK = 0;

-            $RsyncLibErr = "File::RsyncP module version too old: need 0.41";
+            $RsyncLibErr = "File::RsyncP module version"
+                         . " ($File::RsyncP::VERSION) too old: need 0.52";

         } else {
             $RsyncLibOK = 1;
         }
         } else {
             $RsyncLibOK = 1;
         }


@@ -138,24 +142,11 @@ sub start
     } else {
        #
        # Turn $conf->{BackupFilesOnly} and $conf->{BackupFilesExclude}
     } else {
        #
        # Turn $conf->{BackupFilesOnly} and $conf->{BackupFilesExclude}

-       # into a hash of arrays of files.
+       # into a hash of arrays of files, and $conf->{RsyncShareName}
+       # to an array

        #
        #

-       $conf->{RsyncShareName} = [ $conf->{RsyncShareName} ]
-                       unless ref($conf->{RsyncShareName}) eq "ARRAY";
-       foreach my $param qw(BackupFilesOnly BackupFilesExclude) {
-           next if ( !defined($conf->{$param}) );
-           if ( ref($conf->{$param}) eq "ARRAY" ) {
-               $conf->{$param} = {
-                       $conf->{RsyncShareName}[0] => $conf->{$param}
-               };
-           } elsif ( ref($conf->{$param}) eq "HASH" ) {
-               # do nothing
-           } else {
-               $conf->{$param} = {
-                       $conf->{RsyncShareName}[0] => [ $conf->{$param} ]
-               };
-           }
-       }
+       $bpc->backupFileConfFix($conf, "RsyncShareName");
+

         if ( defined($conf->{BackupFilesOnly}{$t->{shareName}}) ) {
             my(@inc, @exc, %incDone, %excDone);
             foreach my $file ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) {
         if ( defined($conf->{BackupFilesOnly}{$t->{shareName}}) ) {
             my(@inc, @exc, %incDone, %excDone);
             foreach my $file ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) {


@@ -176,8 +167,17 @@ sub start
                 # To make this easier we do all the includes first and all
                 # of the excludes at the end (hopefully they commute).
                 #
                 # To make this easier we do all the includes first and all
                 # of the excludes at the end (hopefully they commute).
                 #

+                $file =~ s{/$}{};

                 $file = "/$file";
                 $file =~ s{//+}{/}g;
                 $file = "/$file";
                 $file =~ s{//+}{/}g;

+               if ( $file eq "/" ) {
+                   #
+                   # This is a special case: if the user specifies
+                   # "/" then just include it and don't exclude "/*".
+                   #
+                    push(@inc, $file) if ( !$incDone{$file} );
+                   next;
+               }

                 my $f = "";
                 while ( $file =~ m{^/([^/]*)(.*)} ) {
                     my $elt = $1;
                 my $f = "";
                 while ( $file =~ m{^/([^/]*)(.*)} ) {
                     my $elt = $1;


@@ -213,9 +213,14 @@ sub start
             }
         }
         if ( $t->{type} eq "full" ) {
             }
         }
         if ( $t->{type} eq "full" ) {

-            $logMsg = "full backup started for directory $t->{shareName}";
+           if ( $t->{partialNum} ) {
+               $logMsg = "full backup started for directory $t->{shareName};"
+                       . " updating partial $t->{partialNum}";
+           } else {
+               $logMsg = "full backup started for directory $t->{shareName}";
+           }

         } else {
         } else {

-            $incrDate = $bpc->timeStampISO($t->{lastFull} - 3600, 1);
+            $incrDate = $bpc->timeStamp($t->{lastFull} - 3600, 1);

             $logMsg = "incr backup started back to $incrDate for directory"
                     . " $t->{shareName}";
         }
             $logMsg = "incr backup started back to $incrDate for directory"
                     . " $t->{shareName}";
         }


@@ -234,10 +239,14 @@ sub start
        $rsyncClientCmd = $conf->{RsyncClientCmd};
         $argList = ['--server', '--sender', @$rsyncArgs,
                               '.', $t->{shareNameSlash}];
        $rsyncClientCmd = $conf->{RsyncClientCmd};
         $argList = ['--server', '--sender', @$rsyncArgs,
                               '.', $t->{shareNameSlash}];

+       eval {
+           $argList = File::RsyncP->excludeStrip($argList);
+       };

        $fioArgs = {
        $fioArgs = {

-           client  => $t->{client},
-           share   => $t->{shareName},
-           viewNum => $t->{lastFullBkupNum},
+           client     => $t->{client},
+           share      => $t->{shareName},
+           viewNum    => $t->{lastFullBkupNum},
+            partialNum => $t->{partialNum},

        };
     }
 
        };
     }
 


@@ -263,7 +272,7 @@ sub start
     #
     $t->{rsyncClientCmd} = $rsyncClientCmd;
     $t->{rs} = File::RsyncP->new({
     #
     $t->{rsyncClientCmd} = $rsyncClientCmd;
     $t->{rs} = File::RsyncP->new({

-       logLevel     => $conf->{RsyncLogLevel},
+       logLevel     => $t->{logLevel} || $conf->{RsyncLogLevel},

        rsyncCmd     => sub {
                            $bpc->verbose(0);
                            $bpc->cmdExecOrEval($rsyncClientCmd, $args);
        rsyncCmd     => sub {
                            $bpc->verbose(0);
                            $bpc->cmdExecOrEval($rsyncClientCmd, $args);


@@ -271,25 +280,44 @@ sub start
        rsyncCmdType => "full",
        rsyncArgs    => $rsyncArgs,
        timeout      => $conf->{ClientTimeout},
        rsyncCmdType => "full",
        rsyncArgs    => $rsyncArgs,
        timeout      => $conf->{ClientTimeout},

-       logHandler   => sub {
-                           my($str) = @_;
-                           $str .= "\n";
-                           $t->{XferLOG}->write(\$str);
-                       },
+       doPartial    => defined($t->{partialNum}) ? 1 : undef,
+       logHandler   =>
+                sub {
+                    my($str) = @_;
+                    $str .= "\n";
+                    $t->{XferLOG}->write(\$str);
+                    if ( $str =~ /^Remote\[1\]: read errors mapping "(.*)"/ ) {
+                        #
+                        # Files with read errors (eg: region locked files
+                        # on WinXX) are filled with 0 by rsync.  Remember
+                        # them and delete them later.
+                        #
+                        my $badFile = $1;
+                        $badFile =~ s/^\/+//;
+                        push(@{$t->{badFiles}}, {
+                                share => $t->{shareName},
+                                file  => $badFile
+                            });
+                    }
+                },

        pidHandler   => sub {
                            $t->{pidHandler}(@_);
                        },
        pidHandler   => sub {
                            $t->{pidHandler}(@_);
                        },

+        clientCharset => $conf->{ClientCharset},

        fio          => BackupPC::Xfer::RsyncFileIO->new({
                            xfer       => $t,
                            bpc        => $t->{bpc},
                            conf       => $t->{conf},
                            backups    => $t->{backups},
        fio          => BackupPC::Xfer::RsyncFileIO->new({
                            xfer       => $t,
                            bpc        => $t->{bpc},
                            conf       => $t->{conf},
                            backups    => $t->{backups},

-                           logLevel   => $conf->{RsyncLogLevel},
+                           logLevel   => $t->{logLevel}
+                                              || $conf->{RsyncLogLevel},

                            logHandler => sub {
                                              my($str) = @_;
                                              $str .= "\n";
                                              $t->{XferLOG}->write(\$str);
                                          },
                            logHandler => sub {
                                              my($str) = @_;
                                              $str .= "\n";
                                              $t->{XferLOG}->write(\$str);
                                          },

+                           cacheCheckProb => $conf->{RsyncCsumCacheVerifyProb},
+                            clientCharset  => $conf->{ClientCharset},

                            %$fioArgs,
                      }),
     });
                            %$fioArgs,
                      }),
     });


@@ -411,6 +439,15 @@ sub run
     }
 }
 
     }
 }
 

+sub abort
+{
+    my($t, $reason) = @_;
+    my $rs = $t->{rs};
+
+    $rs->abort($reason);
+    return 1;
+}
+

 sub setSelectMask
 {
     my($t, $FDreadRef) = @_;
 sub setSelectMask
 {
     my($t, $FDreadRef) = @_;