RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-02-21 14:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

marsadm: fix old deletions max_nr detection

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2020-09-05 20:47:50 +02:00
parent 1a8dbb8b93
commit 60baf9c378
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
userspace/marsadm
View File

@ -4323,14 +4323,14 @@ my %delete_nrs;
sub _get_delete_nr {
my ($basedir, $total) = @_;
return @{$delete_nrs{$basedir}} if defined($delete_nrs{$basedir});
my %any = get_any_peers();
_scan_caches() unless %total_peers;
my $min_nr = 0;
my $max_nr = 0;
foreach my $path (lamport_glob("$basedir/deleted-*")) {
$path =~ m:/deleted-(.+):;
my $peer = $1;
next unless $peer;
next unless $total || $peer eq $real_host || $any{$peer};
next unless $total || $peer eq $real_host || $any_peers{$peer};
my $link = get_link($path, 1);
$link =~ m/0*([0-9]+)/;
$min_nr = $1 if (defined($1) && ($1 < $min_nr || !$min_nr));
@ -4342,7 +4342,7 @@ sub _get_delete_nr {
my $nr = $1;
my $peer = $2;
next unless $peer;
next unless $total || $peer eq $real_host || $any{$peer};
next unless $total || $peer eq $real_host || $any_peers{$peer};
$max_nr = $nr if (defined($nr) && $nr > $max_nr);
}
my $nr_links = $max_nr - $min_nr;