RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marsadm: fix {replay,fetch,work}-lognr and replay-basenr 

These were forgotten to export, and they were not systematic.
This commit is contained in:
Thomas Schoebel-Theuer 2016-04-04 09:19:51 +02:00
parent 474d7d0a05
commit d09cc8e218
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
userspace/marsadm
View File

@ -3252,12 +3252,24 @@ sub eval_fn {
my $lnk = $$env{"resdir"} . "/syncstatus-" . $$env{"host"};
return get_link($lnk, 1);
}
if (/^(replay|work)[-_]?(pos|lognr|basenr)$/) {
if (/^(replay)[-_]?(lognr|basenr)$/) {
my $op = $2;
my ($sum, $firstpos, $logpos, $level) = get_amount($$env{"resdir"}, $$env{"host"}, -1, 1);
return $firstpos if $op eq "lognr";
return $logpos;
}
if (/^(fetch)[-_]?(lognr)$/) {
my ($sum, $firstpos, $logpos, $level) = get_amount($$env{"resdir"}, $$env{"host"}, 1, 1);
return $logpos;
}
if (/^(work)[-_]?(lognr)$/) {
my ($sum, $firstpos, $logpos, $level) = get_amount($$env{"resdir"}, $$env{"host"}, 1, 0);
return $logpos;
}
if (/^(replay|work)[-_]?(pos)$/) {
my $what = $1;
my $op = $2;
my ($sum, $firstpos, $logpos, $level) = get_amount($$env{"resdir"}, $$env{"host"}, -1, 0);
return $firstpos if $op eq "lognr";
return $logpos if $op eq "basenr";
return $sum;
}
if (/^(replay[-_]?size)|(fetch[-_]?pos)$/) {
@ -3265,12 +3277,10 @@ sub eval_fn {
my ($sum, $firstpos, $logpos, $level) = get_amount($$env{"resdir"}, $$env{"host"}, 1, 1);
return $sum0 + $sum;
}
if (/^(fetch|work)[-_]?(size|lognr)$/) {
if (/^(fetch|work)[-_]?(size)$/) {
my $what = $1;
my $op = $2;
my ($sum0) = get_amount($$env{"resdir"}, $$env{"host"}, -1, 0);
my ($sum, $firstpos, $logpos, $level) = get_amount($$env{"resdir"}, $$env{"host"}, 1, 0);
return $logpos if $op eq "lognr";
return $sum0 + $sum;
}
if (/^(sync|fetch|replay|work)[-_]?(rest|(?:almost[-_]?|threshold[-_]?)?reached|percent|permille|vector)$/) {
@ -4162,6 +4172,10 @@ my %trivial_globs =
=> "",
"{sync,fetch,replay}-{rate,remain}"
=> "",
"replay-basenr"
=> "",
"{fetch,replay,work}-{lognr}"
=> "",
"summary-vector",
=> "",
"{alive,fetch,replay,work}-{timestamp,age,lag}"