mark failed backups deleted (should they actually be deleted from backups table?)

[BackupPC.git] / bin / BackupPC_incPartsUpdate

diff --git a/bin/BackupPC_incPartsUpdate b/bin/BackupPC_incPartsUpdate
index d602fd8..72a5ba0 100755 (executable)
--- a/bin/BackupPC_incPartsUpdate
+++ b/bin/BackupPC_incPartsUpdate
@@ -130,7 +130,7 @@ sub get_backup_id($$$) {
                FROM backups 
                INNER JOIN shares       ON backups.shareID=shares.ID
                INNER JOIN hosts        ON backups.hostID = hosts.ID
-               where hosts.name = ? and shares.name = ? and backups.num = ?
+               WHERE hosts.name = ? and shares.name = ? and backups.num = ?
        });
        $sth->execute($host, $share, $num);
        my ($id) = $sth->fetchrow_array;
@@ -142,6 +142,15 @@ sub get_backup_id($$$) {
        return $id;
 }
 
+sub backup_inc_deleted($) {
+       my $backup_id = shift;
+       my $sth_inc_deleted = $dbh->prepare(qq{
+               update backups set
+                       inc_deleted = true
+               where id = ?
+       });
+       $sth_inc_deleted->execute($backup_id);
+}
 
 sub tar_check($$$$) {
        my ($host,$share,$num,$filename) = @_;
@@ -274,13 +283,7 @@ sub tar_check($$$$) {
                        print ", EMPTY tar\n";
 
                        my $backup_id = get_backup_id($host, $share, $num);
-
-                       my $sth_inc_deleted = $dbh->prepare(qq{
-                               update backups set
-                                       inc_deleted = true
-                               where id = ?
-                       });
-                       $sth_inc_deleted->execute($backup_id);
+                       backup_inc_deleted( $backup_id );
 
                        $dbh->commit;
 
@@ -378,13 +381,17 @@ select
        hosts.name as host,
        shares.name as share,
        backups.num as num,
+       backups.date,
        inc_size,
-       parts
+       parts,
+       count(backup_parts.backup_id) as backup_parts
 from backups
        join shares on backups.hostid = shares.hostid
                and shares.id = backups.shareid
        join hosts on shares.hostid = hosts.id
-where not inc_deleted
+       full outer join backup_parts on backups.id = backup_parts.backup_id
+where not inc_deleted and backups.size > 0
+group by backups.id, hosts.name, shares.name, backups.num, backups.date, inc_size, parts, backup_parts.backup_id
 order by backups.date
 
 } );
@@ -413,7 +420,7 @@ while (my $row = $sth->fetchrow_hashref) {
 
        print "# size: $size backup.size: ", $row->{inc_size},"\n" if ($opt{d});
 
-       if ( $row->{'inc_size'} != -1 && $size != -1 && $row->{'inc_size'} >= $size) {
+       if ( $row->{'inc_size'} != -1 && $size != -1 && $row->{'inc_size'} >= $size && $row->{parts} == $row->{backup_parts}) {
                if ($check) {
                        tar_check($row->{'host'}, $row->{'share'}, $row->{'num'}, $tar_file) && next;
                } else {
@@ -421,16 +428,18 @@ while (my $row = $sth->fetchrow_hashref) {
                }
        }
 
-       print curr_time, " creating $curr_backup/$num_backups ", $row->{'host'}, ":", $row->{'share'}, " #", $row->{'num'}, " -> $tar_file";
+       print curr_time, " creating $curr_backup/$num_backups ", $row->{host}, ":", $row->{share}, " #", $row->{num},
+               " ", strftime('%Y-%m-%d', localtime($row->{date})), " -> $tar_file";
 
        my $t = time();
 
        # re-create archive?
-       my $cmd = qq{ $tarIncCreate -h "$row->{'host'}" -s "$row->{'share'}" -n $row->{'num'} -f };
+       my $cmd = qq[ $tarIncCreate -h "$row->{host}" -s "$row->{share}" -n $row->{num} -f ];
        print STDERR "## $cmd\n" if ($debug);
 
        if (system($cmd) != 0) {
-               print STDERR " FAILED";
+               print STDERR " FAILED, marking this backup deleted";
+               backup_inc_deleted( $row->{backup_id} );
        }
 
        print ", dur: ",fmt_time(time() - $t), "\n";