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

btrbk: extents-diff: list all related (not only older)

pull/358/head
Axel Burri 2020-11-08 21:02:07 +01:00
parent 208fc36231
commit 22b71bf7da
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
btrbk
View File

@ -5729,15 +5729,9 @@ MAIN:
if($extents_diff_related) { if($extents_diff_related) {
# add all related subvolumes # add all related subvolumes
foreach my $svol (@subvol_args) { foreach my $svol (@subvol_args) {
# filter gen for r/w subvolumes, cgen on readonly subvolumes
# ("gen" is increased on readonly subvolume if it is being snapshotted)
my $svol_gen = $svol->{node}{readonly} ? $svol->{node}{cgen} : $svol->{node}{gen}; my $svol_gen = $svol->{node}{readonly} ? $svol->{node}{cgen} : $svol->{node}{gen};
my @related = map({ vinfo_resolved_all_mountpoints($_, $svol->{VINFO_MOUNTPOINT}) // () } my @related = map({ vinfo_resolved_all_mountpoints($_, $svol->{VINFO_MOUNTPOINT}) // () }
grep { ($_->{readonly} ? $_->{cgen} : $_->{gen}) <= $svol_gen } # show only older
@{get_related_nodes($svol)}); # includes $svol @{get_related_nodes($svol)}); # includes $svol
unless(scalar(@related) > 1) {
WARN "Could not resolve any older (by generation) related subvolume for: $svol->{PRINT}";
}
push @resolved_vol, @related; push @resolved_vol, @related;
} }
} }
@ -5754,10 +5748,12 @@ MAIN:
}; };
my $prev_data; my $prev_data;
# sort descending by gen: crawl descending, but display ascending (unshift) # sort by gen for r/w subvolumes, cgen on readonly subvolumes, as
# "gen" is increased on readonly subvolume when snapshotted.
# crawl descending, but display ascending (unshift):
foreach my $vol (sort { ($b->{node}{readonly} ? $b->{node}{cgen} : $b->{node}{gen}) <=> foreach my $vol (sort { ($b->{node}{readonly} ? $b->{node}{cgen} : $b->{node}{gen}) <=>
($a->{node}{readonly} ? $a->{node}{cgen} : $a->{node}{gen}) } ($a->{node}{readonly} ? $a->{node}{cgen} : $a->{node}{gen}) }
@resolved_vol) { @resolved_vol) {
next if($prev_data && ($prev_data->{_vinfo}{node}{id} == $vol->{node}{id})); # skip duplicates next if($prev_data && ($prev_data->{_vinfo}{node}{id} == $vol->{node}{id})); # skip duplicates
# read extents map # read extents map