import just increments which have files in them

diff --git a/bin/BackupPC_ASA_PostArchive_Update b/bin/BackupPC_ASA_PostArchive_Update
index e70bfb1..445a171 100755 (executable)
--- a/bin/BackupPC_ASA_PostArchive_Update
+++ b/bin/BackupPC_ASA_PostArchive_Update
@@ -89,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;
@@ -143,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;
 
@@ -323,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";
 
@@ -368,6 +396,7 @@ sub check_archive {
        $dbh->commit;
 
        return $same;
+=cut
 }
 
 

diff --git a/test/archive.sh b/test/archive.sh
index c010a6f..ffdcf67 100755 (executable)
--- a/test/archive.sh
+++ b/test/archive.sh
@@ -1 +1 @@
-sudo -u backuppc /srv/BackupPC/bin/BackupPC_ASA_ArchiveStart _search_archive backuppc dellboy hal neven2-pc
+sudo -u backuppc /srv/BackupPC/bin/BackupPC_ASA_ArchiveStart _search_archive backuppc localhost

diff --git a/test/post-archive.sh b/test/post-archive.sh
index aa8f11f..fd73a46 100755 (executable)
--- a/test/post-archive.sh
+++ b/test/post-archive.sh
@@ -1,13 +1,13 @@
 #!/bin/sh -x
 
-sudo -u backuppc /srv/BackupPC/bin/BackupPC_ASA_PostArchive_Update \
- -h dellboy -n 0 \
- -h dellboy -n 1 \
- -h dellboy -n 2 \
- -h dellboy -n 3 \
- -h dellboy -n 4 \
- -h dellboy -n 5 \
- -h dellboy -n 6 \
- -h dellboy -n 7 \
- -h dellboy -n 8 \
- -h dellboy -n 9 \
+sudo -u backuppc /srv/BackupPC/bin/BackupPC_ASA_PostArchive_Update --ok=1 \
+ -h localhost -n 0 \
+ -h localhost -n 1 \
+ -h localhost -n 2 \
+ -h localhost -n 3 \
+ -h localhost -n 4 \
+ -h localhost -n 5 \
+ -h localhost -n 6 \
+ -h localhost -n 7 \
+ -h localhost -n 8 \
+ -h localhost -n 9 \