X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_ASA_PostArchive_Update;h=1dea094f44b401a8c5f7e15eff9888b950afd77f;hp=3ffb76318bf7afb3b6e84d0db2732f871fa8febb;hb=93efae407e03b97af4872e7c84a1d8a47ef5f391;hpb=9f0ea642edefd2f8b6ad9e9f4807e6ab03485da7

diff --git a/bin/BackupPC_ASA_PostArchive_Update b/bin/BackupPC_ASA_PostArchive_Update
index 3ffb763..1dea094 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" ],
@@ -120,6 +121,13 @@ my $sth_inc_size = $dbh->prepare(qq{
 	where id = ?
 });
 
+sub read_only {
+	my $full = shift;
+	my $perm = (stat $full)[2] & 0444;
+	warn sprintf("chmod %03o %s\n",$perm,$full);
+	chmod $perm, $full || die $!;
+}
+
 sub check_archive {
 	my ($host,$num) = @_;
 	warn "# check_archive $host $num";
@@ -140,8 +148,12 @@ sub check_archive {
 	my $md5_path = "$Conf{ArchiveDest}/$host.$num.md5";
 	unlink $md5_path if -s $md5_path == 0; # fix empty
 
+	my $read_protect = 0;
+
 	if ( ! -e $md5_path ) {
 		system_ok "cd $Conf{ArchiveDest} && /usr/bin/md5sum $host.$num.* > $md5_path";
+		read_only $md5_path;
+		$read_protect = 1;
 	} else {
 		system_ok "cd $Conf{ArchiveDest} && /usr/bin/md5sum -c $md5_path" if $opt->check;
 	}
@@ -150,6 +162,7 @@ sub check_archive {
 	foreach ( split(/\n/, read_file "$Conf{ArchiveDest}/$host.$num.md5" ) ) {
 		my ( $md5, $path ) = split(/\s+/,$_);
 		$md5sum->{$path} = $md5;
+		read_only "$Conf{ArchiveDest}/$path" if $read_protect;
 	}
 
 	# depending on expected returned value this is used like:
@@ -183,16 +196,16 @@ sub check_archive {
 	}
 
 	sub check_part {
-		my ($host, $num, $part_nr, $tar_size, $size, $md5, $items) = @_;
+		my ($host, $num, $part_nr, $tar_size, $size, $md5, $items, $filename) = @_;
 		my $backup_id = get_backup_id($host, $num);
 		my $sth_md5 = $dbh->prepare(qq{
 			select
-				id, tar_size, size, md5, items
+				id, tar_size, size, md5, items, filename
 			from backup_parts
-			where backup_id = ? and part_nr = ?
+			where backup_id = ? and part_nr = ? and filename = ?
 		});
 
-		$sth_md5->execute($backup_id, $part_nr);
+		$sth_md5->execute($backup_id, $part_nr, $filename);
 
 		if (my $row = $sth_md5->fetchrow_hashref) {
 			return if (
@@ -212,12 +225,12 @@ sub check_archive {
 				tar_size,
 				size,
 				md5,
-				items
-			) values (?,?,?,?,?,?)
+				items,
+				filename
+			) values (?,?,?,?,?,?,?)
 		});
 
-		$sth_insert->execute($backup_id, $part_nr, $tar_size, $size, $md5, $items);
-		$dbh->commit;
+		$sth_insert->execute($backup_id, $part_nr, $tar_size, $size, $md5, $items, $filename);
 	}
 
 	print " [parts: ",join(", ", @tar_parts),"]" if $opt->debug;
@@ -263,8 +276,8 @@ sub check_archive {
 			$items++;
 			$tar_size_inarc += $entry->size;
 
-			if ($tar_size_inarc > $Conf{MaxArchiveFileSize}) {
-				print ", part $filename is too big $tar_size_inarc > $Conf{MaxArchiveFileSize}\n";
+			if ($tar_size_inarc > $Conf{ArchiveMediaSize}) {
+				print ", part $filename is too big $tar_size_inarc > $Conf{ArchiveMediaSize}\n";
 				return 0;
 			}
 
@@ -298,10 +311,10 @@ sub check_archive {
 		my $items = 1;
 		$part_nr++;
 
-		check_part($host, $num, $part_nr, $tar_size, $size, $md5, $items);
+		check_part($host, $num, $part_nr, $tar_size, $size, $md5, $items, $filename);
 
 		# round increment size to 2k block size
-		$inc_size += int(($size + 2048) / 2048);
+		$inc_size += int((($size + 2048) / 2048 ) * 2048);
 	}
 
 	$sth_inc_size->execute(
@@ -309,7 +322,6 @@ sub check_archive {
 		$part_nr,
 		get_backup_id($host, $num),
 	);
-	$dbh->commit;
 
 	@tar_files = sort @tar_files;
 	print "\n\t",($#tar_files + 1), " tar files";
@@ -353,6 +365,8 @@ sub check_archive {
 	print " ",($same ? 'ok' : 'DIFFERENT'),
 		", dur: ",fmt_time(time() - $t), "\n";
 
+	$dbh->commit;
+
 	return $same;
 }
 
@@ -364,7 +378,15 @@ foreach ( 0 .. $#{ $opt->host } ) {
 	my $host = $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;
+	}
 
 }
 
@@ -433,8 +455,6 @@ while (my $row = $sth->fetchrow_hashref) {
 
 	print ", dur: ",fmt_time(time() - $t), "\n";
 
-	$dbh->commit;
-
 }
 
 undef $sth;