added common BackupPC::Search::host_backup_nums

[BackupPC.git] / bin / BackupPC_ASA_PostArchive_Update

diff --git a/bin/BackupPC_ASA_PostArchive_Update b/bin/BackupPC_ASA_PostArchive_Update
index e70bfb1..757c93d 100755 (executable)
--- a/bin/BackupPC_ASA_PostArchive_Update
+++ b/bin/BackupPC_ASA_PostArchive_Update
@@ -80,20 +80,22 @@ sub get_backup_id($$) {
        my $key = "$host $num";
        return $hsn_cache->{$key} if ($hsn_cache->{$key});
 
+       # all backup parts will be attached to first share in backups
        my $sth = $dbh->prepare(qq{
                SELECT 
-                       backups.id
+                       min(backups.id)
                FROM backups 
                INNER JOIN shares       ON backups.shareID=shares.ID
                INNER JOIN hosts        ON backups.hostID = hosts.ID
                WHERE hosts.name = ? and backups.num = ?
        });
        $sth->execute($host, $num);
+       die "can't find backup $host:$num" unless $sth->rows == 1;
        my ($id) = $sth->fetchrow_array;
 
-       $hsn_cache->{"$host $num"} = $id;
+       $hsn_cache->{$key} = $id;
 
-       print STDERR "# $host $num == $id\n" if $opt->debug;
+       print STDERR "# $key == $id\n" if $opt->debug;
 
        return $id;
 }
@@ -143,10 +145,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;
 
@@ -323,6 +345,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";
 
@@ -368,11 +397,14 @@ sub check_archive {
        $dbh->commit;
 
        return $same;
+=cut
 }
 
 
 #----- main
 
+exit unless $opt->host;
+
 foreach ( 0 .. $#{ $opt->host } ) {
 
        my $host = lc $opt->host->[$_];