import just increments which have files in them

[BackupPC.git] / bin / BackupPC_ASA_PostArchive_Update

diff --git a/bin/BackupPC_ASA_PostArchive_Update b/bin/BackupPC_ASA_PostArchive_Update
index e3d022d..445a171 100755 (executable)
--- a/bin/BackupPC_ASA_PostArchive_Update
+++ b/bin/BackupPC_ASA_PostArchive_Update
@@ -38,6 +38,7 @@ my ($opt,$usage) = describe_options(
 "%c %o",
 [ 'host|h=s@', "import just host(s)" ],
 [ 'num|n=s@',  "import just backup number(s)" ],
+[ 'ok=n',       "xferOK", { default => 0 } ],
 [ 'check|c',   "check archives on disk and sync", { default => 1 } ],
 [ 'debug|d',   "debug", { default => 1 } ],
 [ 'help',      "show help" ],
@@ -88,6 +89,7 @@ sub get_backup_id($$) {
                WHERE hosts.name = ? and backups.num = ?
        });
        $sth->execute($host, $num);
+       die "can't find backup $host:$num" unless $sth->rows;
        my ($id) = $sth->fetchrow_array;
 
        $hsn_cache->{"$host $num"} = $id;
@@ -142,10 +144,30 @@ sub check_archive {
                return;
        }
 
-       print curr_time, " check $host $num";
+       print curr_time, " check $host $num\n";
+
+       my $sth = $dbh->prepare(qq{
+               SELECT count(*)
+               FROM files
+               JOIN shares on shares.id = shareid
+               JOIN hosts on hosts.id = shares.hostid
+               WHERE hosts.name = ? and backupnum = ?
+       });
+       $sth->execute($host, $num);
+       my ($files) = $sth->fetchrow_array;
+
+       if ( $files == 0 ) {
+               warn "EMPTY INCREMENT, cleanup ",dump( @tar_parts );
+               foreach my $path ( @tar_parts ) {
+                       my $full = "$Conf{ArchiveDest}/$path";
+                       warn "rm $full\n";
+                       unlink $full || die "can't remove $full: $!";
+               }
+               return;
+       }
 
        my $md5_path = "$Conf{ArchiveDest}/$host.$num.md5";
-       unlink $md5_path if -s $md5_path == 0; # fix empty
+       unlink $md5_path if -e $md5_path && -s $md5_path == 0; # fix empty
 
        my $read_protect = 0;
 
@@ -322,6 +344,13 @@ sub check_archive {
                get_backup_id($host, $num),
        );
 
+       warn "## commit\n";
+       $dbh->commit;
+
+       return;
+
+=for removed
+
        @tar_files = sort @tar_files;
        print "\n\t",($#tar_files + 1), " tar files";
 
@@ -367,6 +396,7 @@ sub check_archive {
        $dbh->commit;
 
        return $same;
+=cut
 }
 
 
@@ -374,10 +404,18 @@ sub check_archive {
 
 foreach ( 0 .. $#{ $opt->host } ) {
 
-       my $host = $opt->host->[$_];
+       my $host = lc $opt->host->[$_];
        my $num  = $opt->num->[$_];
 
-       check_archive $host => $num;
+       if ( ! $opt->ok ) {
+               warn "ERROR $host $num running cleanup";
+               foreach my $path ( glob "$Conf{ArchiveDest}/$host.$num.*" ) {
+                       warn "# rm $path";
+                       unlink $path || die $!;
+               }
+       } else {
+               check_archive $host => $num;
+       }
 
 }