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

btrbk: use "archive_target" config context for archives 

Distinguish normal "target" and (generated) "archive_target"
configuration context (printed in transaction log for
"abort_<context>" actions).
pull/286/head
Axel Burri 2019-04-18 16:40:25 +02:00
parent a7da44cf2f
commit e36289a769
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
btrbk
View File

@ -3941,7 +3941,6 @@ sub macro_send_receive(@)
my @clone_src = @{ $info{clone_src} // [] }; # copy array my @clone_src = @{ $info{clone_src} // [] }; # copy array
my $clone_src_extra = $info{clone_src_extra} // []; my $clone_src_extra = $info{clone_src_extra} // [];
my $config_target = $target->{CONFIG}; my $config_target = $target->{CONFIG};
die unless($config_target->{CONTEXT} eq "target");
my $target_type = $config_target->{target_type} || die; my $target_type = $config_target->{target_type} || die;
my $incremental = config_key($config_target, "incremental"); my $incremental = config_key($config_target, "incremental");
@ -5153,7 +5152,7 @@ MAIN:
url => $sroot_url, # ABORTED() needs this url => $sroot_url, # ABORTED() needs this
snapshot_name => $snapshot_name, snapshot_name => $snapshot_name,
}; };
my $config_droot = { CONTEXT => "target", my $config_droot = { CONTEXT => "archive_target",
PARENT => $config_sroot, PARENT => $config_sroot,
target_type => "send-receive", # macro_send_receive checks this target_type => "send-receive", # macro_send_receive checks this
url => $droot_url, # ABORTED() needs this url => $droot_url, # ABORTED() needs this
@ -5223,7 +5222,7 @@ MAIN:
next; next;
} }
foreach my $droot (vinfo_subsection($sroot, 'target')) { foreach my $droot (vinfo_subsection($sroot, 'archive_target')) {
INFO "Archiving subvolumes: $sroot->{PRINT}/${snapshot_name}.*"; INFO "Archiving subvolumes: $sroot->{PRINT}/${snapshot_name}.*";
macro_archive_target($sroot, $droot, $snapshot_name, { results => $schedule_results }); macro_archive_target($sroot, $droot, $snapshot_name, { results => $schedule_results });
if(IS_ABORTED($droot)) { if(IS_ABORTED($droot)) {
@ -5246,7 +5245,7 @@ MAIN:
$del_schedule_results = []; $del_schedule_results = [];
foreach my $sroot (vinfo_subsection($config, 'archive_source')) { foreach my $sroot (vinfo_subsection($config, 'archive_source')) {
my $snapshot_name = config_key($sroot, "snapshot_name") // die; my $snapshot_name = config_key($sroot, "snapshot_name") // die;
foreach my $droot (vinfo_subsection($sroot, 'target')) { foreach my $droot (vinfo_subsection($sroot, 'archive_target')) {
INFO "Cleaning archive: $droot->{PRINT}/${snapshot_name}.*"; INFO "Cleaning archive: $droot->{PRINT}/${snapshot_name}.*";
macro_delete($droot, "", $snapshot_name, $droot, macro_delete($droot, "", $snapshot_name, $droot,
{ preserve => config_preserve_hash($droot, "archive"), { preserve => config_preserve_hash($droot, "archive"),
@ -5293,7 +5292,7 @@ MAIN:
my @unrecoverable; my @unrecoverable;
my @out; my @out;
foreach my $sroot (vinfo_subsection($config, 'archive_source', 1)) { foreach my $sroot (vinfo_subsection($config, 'archive_source', 1)) {
foreach my $droot (vinfo_subsection($sroot, 'target', 1)) { foreach my $droot (vinfo_subsection($sroot, 'archive_target', 1)) {
my @subvol_out; my @subvol_out;
if($droot->{SUBDIR_CREATED}) { if($droot->{SUBDIR_CREATED}) {
push @subvol_out, "++. $droot->{PRINT}/"; push @subvol_out, "++. $droot->{PRINT}/";