mirror of https://github.com/schoebel/mars
marsadm: do resource checks only once per command
This commit is contained in:
parent
da3652bba9
commit
6798580065
|
@ -1784,13 +1784,17 @@ if ($cmd eq "show") {
|
||||||
|
|
||||||
lprint "using FORCE option -- hopefully you know what you do!\n" if $force;
|
lprint "using FORCE option -- hopefully you know what you do!\n" if $force;
|
||||||
|
|
||||||
|
my %checked_res;
|
||||||
|
|
||||||
sub do_one_res {
|
sub do_one_res {
|
||||||
my $func = shift;
|
my $func = shift;
|
||||||
my ($cmd, $res) = @_;
|
my ($cmd, $res) = @_;
|
||||||
|
|
||||||
|
if (!$checked_res{"$cmd$res"}) {
|
||||||
$res = check_res($res) unless $cmd =~ m/^(join|create|leave|wait)-cluster|create-resource|show|cat|[a-z]+-file|set-link$/;
|
$res = check_res($res) unless $cmd =~ m/^(join|create|leave|wait)-cluster|create-resource|show|cat|[a-z]+-file|set-link$/;
|
||||||
check_res_member($res) unless $cmd =~ m/^(join|create)-(cluster|resource)|(leave|wait)-cluster|show|cat|[a-z]+-file|set-link$/;
|
check_res_member($res) unless $cmd =~ m/^(join|create)-(cluster|resource)|(leave|wait)-cluster|show|cat|[a-z]+-file|set-link$/;
|
||||||
|
$checked_res{"$cmd$res"} = 1;
|
||||||
|
}
|
||||||
&{$func}(@_);
|
&{$func}(@_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue