ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: simplify transaction function calls 

Prefix transaction status with "dryrun_" in start_transaction() /
end_transaction if $dryrun is set.
pull/204/head
Axel Burri 2017-09-27 19:35:43 +02:00
parent 422d52c063
commit 9d9527ca9a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
btrbk
View File

@ -463,18 +463,20 @@ sub start_transaction($@)
my @actions = (ref($_[0]) eq "HASH") ? @_ : { @_ }; # single action is not hashref my @actions = (ref($_[0]) eq "HASH") ? @_ : { @_ }; # single action is not hashref
$current_transaction = []; $current_transaction = [];
foreach (@actions) { foreach (@actions) {
push @$current_transaction, action($type, %$_, status => "starting", time => $time); push @$current_transaction, action($type, %$_, status => ($dryrun ? "dryrun_starting" : "starting"), time => $time);
} }
} }
sub end_transaction($$) sub end_transaction($$)
{ {
my $type = shift // die; my $type = shift // die;
my $status = shift // die; my $success = shift; # scalar or coderef: if scalar, status is set for all current transitions
my $time = time; my $time = time;
die("end_transaction() while no transaction is running") unless($current_transaction); die("end_transaction() while no transaction is running") unless($current_transaction);
foreach (@$current_transaction) { foreach (@$current_transaction) {
die("end_transaction() has different type") unless($_->{type} eq $type); die("end_transaction() has different type") unless($_->{type} eq $type);
my $status = (ref($success) ? &{$success} ($_) : $success) ? "success" : "ERROR";
$status = "dryrun_" . $status if($dryrun);
action($type, %$_, status => $status, time => $time, duration => ($dryrun ? undef : ($time - $_->{time}))); action($type, %$_, status => $status, time => $time, duration => ($dryrun ? undef : ($time - $_->{time})));
} }
$current_transaction = undef; $current_transaction = undef;
@ -1134,7 +1136,7 @@ sub btrfs_subvolume_snapshot($$)
my $ret = run_cmd(cmd => vinfo_cmd($svol, "btrfs subvolume snapshot", '-r', { unsafe => $src_path }, { unsafe => $target_path } ), my $ret = run_cmd(cmd => vinfo_cmd($svol, "btrfs subvolume snapshot", '-r', { unsafe => $src_path }, { unsafe => $target_path } ),
rsh => vinfo_rsh($svol), rsh => vinfo_rsh($svol),
); );
end_transaction("snapshot", ($dryrun ? "DRYRUN" : (defined($ret) ? "success" : "ERROR"))); end_transaction("snapshot", defined($ret));
unless(defined($ret)) { unless(defined($ret)) {
ERROR "Failed to create btrfs subvolume snapshot: $svol->{PRINT} -> $target_path"; ERROR "Failed to create btrfs subvolume snapshot: $svol->{PRINT} -> $target_path";
return undef; return undef;
@ -1193,7 +1195,7 @@ sub btrfs_subvolume_delete($@)
rsh => vinfo_rsh($targets->[0]), rsh => vinfo_rsh($targets->[0]),
); );
} }
end_transaction($opts{type} // "delete", ($dryrun ? "DRYRUN" : (defined($ret) ? "success" : "ERROR"))); end_transaction($opts{type} // "delete", defined($ret));
ERROR "Failed to delete btrfs subvolumes: " . join(' ', map( { $_->{PRINT} } @$targets)) unless(defined($ret)); ERROR "Failed to delete btrfs subvolumes: " . join(' ', map( { $_->{PRINT} } @$targets)) unless(defined($ret));
return defined($ret) ? scalar(@$targets) : undef; return defined($ret) ? scalar(@$targets) : undef;
} }
@ -1318,7 +1320,7 @@ sub btrfs_send_receive($$$$)
} }
} }
end_transaction("send-receive", ($dryrun ? "DRYRUN" : ($send_receive_error ? "ERROR" : "success"))); end_transaction("send-receive", not $send_receive_error);
if($send_receive_error) { if($send_receive_error) {
ERROR "Failed to send/receive btrfs subvolume: $snapshot->{PRINT} " . ($parent_path ? "[$parent_path]" : "") . " -> $target->{PRINT}"; ERROR "Failed to send/receive btrfs subvolume: $snapshot->{PRINT} " . ($parent_path ? "[$parent_path]" : "") . " -> $target->{PRINT}";
@ -1587,7 +1589,7 @@ sub btrfs_send_to_file($$$;$$)
$ret = system_write_raw_info($vol_received, \%raw_info); $ret = system_write_raw_info($vol_received, \%raw_info);
} }
} }
end_transaction("send-to-raw", ($dryrun ? "DRYRUN" : (defined($ret) ? "success" : "ERROR"))); end_transaction("send-to-raw", defined($ret));
unless(defined($ret)) { unless(defined($ret)) {
ERROR "Failed to send btrfs subvolume to raw file: $source->{PRINT} " . ($parent_path ? "[$parent_path]" : "") . " -> $vol_received->{PRINT}"; ERROR "Failed to send btrfs subvolume to raw file: $source->{PRINT} " . ($parent_path ? "[$parent_path]" : "") . " -> $vol_received->{PRINT}";
return undef; return undef;
@ -4603,7 +4605,7 @@ MAIN:
else else
{ {
# print action log (without transaction start messages) # print action log (without transaction start messages)
my @data = grep { $_->{status} ne "starting" } @transaction_log; my @data = grep { $_->{status} !~ /starting$/ } @transaction_log;
print_formatted("transaction", \@data, title => "TRANSACTION LOG"); print_formatted("transaction", \@data, title => "TRANSACTION LOG");
} }
} }
@ -5383,7 +5385,7 @@ MAIN:
else else
{ {
# print action log (without transaction start messages) # print action log (without transaction start messages)
my @data = grep { $_->{status} ne "starting" } @transaction_log; my @data = grep { $_->{status} !~ /starting$/ } @transaction_log;
print_formatted("transaction", \@data, title => "TRANSACTION LOG"); print_formatted("transaction", \@data, title => "TRANSACTION LOG");
} }
} }
@ -5817,7 +5819,7 @@ MAIN:
else else
{ {
# print action log (without transaction start messages) # print action log (without transaction start messages)
my @data = grep { $_->{status} ne "starting" } @transaction_log; my @data = grep { $_->{status} !~ /starting$/ } @transaction_log;
print_formatted("transaction", \@data, title => "TRANSACTION LOG"); print_formatted("transaction", \@data, title => "TRANSACTION LOG");
} }
} }