X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_ASA_PostArchive_Update;h=757c93d8b33cee48ccba3af6c197d12d031c4b0c;hp=e3d022d30adbde5458448bda849400bd8356264a;hb=7ea17fdc1fa132601268e2b4c0a2046af7eb9180;hpb=f9e5f01434c96d5cf7a6c866c5a8bd51787ab939

diff --git a/bin/BackupPC_ASA_PostArchive_Update b/bin/BackupPC_ASA_PostArchive_Update
index e3d022d..757c93d 100755
--- 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" ],
@@ -79,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;
 }
@@ -142,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;
 
@@ -322,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";
 
@@ -367,17 +397,28 @@ sub check_archive {
 	$dbh->commit;
 
 	return $same;
+=cut
 }
 
 
 #----- main
 
+exit unless $opt->host;
+
 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;
+	}
 
 }