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
+ full outer join backup_parts on backups.id = backup_parts.backup_id
where not inc_deleted
+group by backups.id, hosts.name, shares.name, backups.num, backups.date, inc_size, parts, backup_parts.backup_id
order by backups.date
} );
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 {
}
}
- 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();