public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: STABLE3 - fence_mcdata: Fix unexpected port state
@ 2009-03-04 14:32 Jan Friesse
0 siblings, 0 replies; only message in thread
From: Jan Friesse @ 2009-03-04 14:32 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=aafa9d1527439bfc77865f3a7009404ea6e96de9
Commit: aafa9d1527439bfc77865f3a7009404ea6e96de9
Parent: 8d81506e247d5471301a24132e9a6ae1d19c6884
Author: Jan Friesse <jfriesse@redhat.com>
AuthorDate: Wed Mar 4 15:29:31 2009 +0100
Committer: Jan Friesse <jfriesse@redhat.com>
CommitterDate: Wed Mar 4 15:31:32 2009 +0100
fence_mcdata: Fix unexpected port state
Current versions of fence_mcdata wait for "Blocked:
(true|false)", but newer models (like Sphereon 4500) return
"Blocked: (Blocked|Unblocked)" on the port show command.
The attached patch adds the necessary bits to make the
script recognize that it has indeed done the request action.
This patch long lives in RHEL 4 branch, but never
arrived to RHEL5/master/STABLE2/STABLE3.
RHBZ#470983
---
fence/agents/mcdata/fence_mcdata.pl | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fence/agents/mcdata/fence_mcdata.pl b/fence/agents/mcdata/fence_mcdata.pl
index 96ab681..7a01d1d 100644
--- a/fence/agents/mcdata/fence_mcdata.pl
+++ b/fence/agents/mcdata/fence_mcdata.pl
@@ -265,7 +265,9 @@ foreach my $line (@lines)
}
next unless ( $field eq "Blocked" );
if ( ($block && $b_state eq "true") ||
- (!$block && $b_state eq "false") )
+ (!$block && $b_state eq "false") ||
+ ($block && $b_state eq "Blocked") ||
+ (!$block && $b_state eq "Unblocked") )
{
$fail = 0;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-04 14:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-04 14:32 cluster: STABLE3 - fence_mcdata: Fix unexpected port state Jan Friesse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).