Re: [Cluster-devel] cluster: RHEL6 - Apply patch from John Ruemker to resolve rhbz#803474
Hi Ryan,
This patch is not upstream (STABLE32 branch) and has not been
reviewed/ack'ed for inclusion.
Commit has been reverted from the RHEL6 branch.
Please also write a more comprehensive changelog entry in the commit
because not all bugzilla's are visible to outside world.
Example:
Fix this or that by init var foo to NULL and compare blabla
Patch from
Resolves: rhbz#123456
Thanks
Fabio
On 04/09/2012 09:35 PM, Ryan McCabe wrote:
> Gitweb:
> http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=cd9d9be98b4276c4e73eac81563f54e92a08045d
> Commit:cd9d9be98b4276c4e73eac81563f54e92a08045d
> Parent:54a29913c5de797da6adb69e03b38487fef451b4
> Author:Ryan McCabe
> AuthorDate:Mon Apr 9 15:34:08 2012 -0400
> Committer: Ryan McCabe
> CommitterDate: Mon Apr 9 15:35:50 2012 -0400
>
> Apply patch from John Ruemker to resolve rhbz#803474
>
> ---
> rgmanager/src/daemons/main.c |8 +++-
> rgmanager/src/daemons/rg_event.c |4 ++--
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
> index 94047c3..9a1e5e9 100644
> --- a/rgmanager/src/daemons/main.c
> +++ b/rgmanager/src/daemons/main.c
> @@ -456,7 +456,13 @@ dispatch_msg(msgctx_t *ctx, int nodeid, int need_close)
> /* Centralized processing or request is from
> clusvcadm */
> nid = event_master();
> - if (nid != my_id()) {
> + if (nid < 0) {
> + logt_print(LOG_ERR, "#40b: Unable to determine "
> + "event master\n");
> + ret = -1;
> + goto out;
> + }
> + else if (nid != my_id()) {
> /* Forward the message to the event master */
> forward_message(ctx, msg_sm, nid);
> } else {
> diff --git a/rgmanager/src/daemons/rg_event.c
> b/rgmanager/src/daemons/rg_event.c
> index 7048bc6..e6a2abd 100644
> --- a/rgmanager/src/daemons/rg_event.c
> +++ b/rgmanager/src/daemons/rg_event.c
> @@ -247,7 +247,7 @@ static int
> find_master(void)
> {
> event_master_t *masterinfo = NULL;
> - void *data;
> + void *data = NULL;
> uint32_t sz;
> cluster_member_list_t *m;
> uint64_t vn;
> @@ -255,7 +255,7 @@ find_master(void)
>
> m = member_list();
> if (vf_read(m, "Transition-Master", &vn,
> - (void **)(&data), &sz) < 0) {
> + (void **)(&data), &sz) != VFR_OK) {
> logt_print(LOG_ERR, "Unable to discover master"
> " status\n");
> masterinfo = NULL;
> ___
> cluster-commits mailing list
> cluster-comm...@lists.fedorahosted.org
> https://fedorahosted.org/mailman/listinfo/cluster-commits
Re: [Cluster-devel] [PATCH] fence_scsi_test: add option for strict verification
On 04/09/2012 10:37 AM, Ryan O'Hara wrote: 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 Reviewed-by: Lon Hohberger -- Lon
Re: [Cluster-devel] [PATCH] fence_scsi_test: increment error count when reservation fails
On 04/09/2012 10:34 AM, Ryan O'Hara wrote: If the do_action_on subroutine fails to create a reservation, the error count should be incremented not set to zero. Resolves: rhbz#809481 ACK -- Lon
[Cluster-devel] [PATCH] fence_scsi_test: add option for strict verification
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
---
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=LISTDevices used for the current
action.\n";
+print " -s, --strict Perform strict verification.\n";
print " -h, --helpDisplay 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
[Cluster-devel] [PATCH] fence_scsi_test: increment error count when reservation fails
If the do_action_on subroutine fails to create a reservation, the
error count should be incremented not set to zero.
Resolves: rhbz#809481
Signed-off-by: Ryan O'Hara
---
fence/agents/scsi/fence_scsi_test.pl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/scsi/fence_scsi_test.pl
b/fence/agents/scsi/fence_scsi_test.pl
index 5c2302c..c012a12 100755
--- a/fence/agents/scsi/fence_scsi_test.pl
+++ b/fence/agents/scsi/fence_scsi_test.pl
@@ -44,7 +44,7 @@ sub do_action_on (\@$$)
if (scalar (get_keys_reserve ($dev)) == 0) {
if (do_reserve ($dev, $node_key) != 0) {
- $err = 0;
+ $err++;
}
}
-- 1.7.1
