Add new option --strict (-s) that will enable strict verification that
registrations are created on all paths. Previously this was the
default behavior. Strict verification will compare the number of times
the registration key exists on a device and the number of paths. This
is useful when testing multipath configurations. If this option is not
specified, the verification will simply check to make sure the
registration keys exist on the device.
Resolves: rhbz#782919
Signed-off-by: Ryan O'Hara <[email protected]>
---
fence/agents/scsi/fence_scsi_test.pl | 6 +++++-
fence/man/fence_scsi_test.8 | 8 ++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/fence/agents/scsi/fence_scsi_test.pl
b/fence/agents/scsi/fence_scsi_test.pl
index 5c2302c..4463ddf 100755
--- a/fence/agents/scsi/fence_scsi_test.pl
+++ b/fence/agents/scsi/fence_scsi_test.pl
@@ -101,7 +101,9 @@ sub do_verify_on (\@$$)
@keys = grep { /^$node_key$/ } get_keys_register ($dev);
- if (scalar (@keys) != scalar (@devices)) {
+ if (scalar (@keys) == 0) {
+ $err++;
+ } elsif (defined $options{'s'} && (scalar (@keys) != scalar
(@devices))) {
$err++;
}
@@ -322,6 +324,7 @@ sub get_options ()
"h|help",
"k|key=s",
"o|action=s",
+ "s|strict",
"t|test=s",
"v|verbose");
@@ -608,6 +611,7 @@ sub print_usage
print "\n";
print " -k, --key=VALUE Key to use with current action.\n";
print " -d, --devices=LIST Devices used for the current
action.\n";
+ print " -s, --strict Perform strict verification.\n";
print " -h, --help Display this help and exit.\n";
print " -v, --verbose Verbose mode.\n";
print "\n";
diff --git a/fence/man/fence_scsi_test.8 b/fence/man/fence_scsi_test.8
index 57c3713..596bc2d 100644
--- a/fence/man/fence_scsi_test.8
+++ b/fence/man/fence_scsi_test.8
@@ -77,6 +77,14 @@ specified, fence_scsi_test will automatically use all
devices found in
cluster volumes.
.TP
+\fB-s, --strict\fR
+Perform strict verification that registrations exist on all
+paths. This option is recommended when testing multipath
+configurations. When specified, fence_scsi_test will compare the
+number of paths to the number of times the registration key exists on
+the I_T nexus. This option only is only used with the "on" action.
+
+.TP
\fB-h, --help\fR
Print out a help message describing available options, then exit.
-- 1.7.1
