RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2024-12-28 09:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

marsadm: also show resource and cluster count in detail view

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2019-07-30 07:33:23 +02:00
parent 697d113cae
commit 3cdecaec7d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
userspace/marsadm
View File

@ -4271,8 +4271,10 @@ sub eval_fn {
return defined($result) && $result;
}
# list objects
if (/^cluster[-_]?members$/) {
if (/^(count[-_]?)?cluster[-_]?members$/) {
my $do_count = $1;
my @peers = glob("$mars/ips/ip-*");
return scalar(@peers) if defined($do_count);
my $list = "";
foreach my $peer (sort(@peers)) {
$peer =~ s:^$mars/ips/ip-::;
@ -4280,8 +4282,10 @@ sub eval_fn {
}
return $list;
}
if (/^resource[-_]?members$/) {
if (/^(count[-_]?)?resource[-_]?members$/) {
my $do_count = $1;
my @peers = glob($$env{"resdir"} . "/data-*");
return scalar(@peers) if defined($do_count);
my $list = "";
foreach my $peer (sort(@peers)) {
$peer =~ s:^.*/data-::;
@ -5016,7 +5020,8 @@ my %complex_macros =
(
"default"
=> "%if{%{res}}{"
. " %{res} %include{diskstate} %include{replstate} %include{flags} %include{role} %include{primarynode} %include{commstate}\n"
. " %{res} [%count-resource-members{%{res}}/%count-cluster-members{}]"
. " %include{diskstate} %include{replstate} %include{flags} %include{role} %include{primarynode} %include{commstate}\n"
. "%if{%>{%-{%disk-size{}}{%resource-size{}}}{%{threshold}}}{"
. " Hint: you are wasting %human-numbers{}{ }{ }{%-{%disk-size{}}{%resource-size{}}} on disk %get-disk{}\n"
. "}"
@ -5489,6 +5494,8 @@ my %trivial_globs =
=> "",
"{cluster,resource}-members"
=> "",
"count-{cluster,resource}-members"
=> "",
"{disk,resource,device}-size"
=> "",
"deletable-size"