cluster: RHEL6 - cpglockd: Fix a hang triggered when fencing completes in less than 1s

[Ryan McCabe]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        e01a564837cc5f5310a046da3c71f995c301e649
Parent:        e577c6d731c33b8309f02d7805d5a6fa59da5773
Author:        Ryan McCabe <rmccabe(a)redhat.com&gt;
AuthorDate:    Mon May 14 10:34:48 2012 -0400
Committer:     Ryan McCabe <rmccabe(a)redhat.com&gt;
CommitterDate: Mon May 14 10:43:53 2012 -0400

cpglockd: Fix a hang triggered when fencing completes in less than 1s

Acked-by: Fabio M. Di Nitto <fdinitto(a)redhat.com&gt;
Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com&gt;
---
 rgmanager/src/daemons/cpglockd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/daemons/cpglockd.c b/rgmanager/src/daemons/cpglockd.c
index 1a5832c..95cb371 100644
--- a/rgmanager/src/daemons/cpglockd.c
+++ b/rgmanager/src/daemons/cpglockd.c
@@ -1655,9 +1655,9 @@ main(int argc, char **argv)
 				lft = fn.last_fenced_time;
 			}
 
-			if (lft > pf_node->fail_time) {
+			if (lft >= pf_node->fail_time) {
 				logt_print(LOG_DEBUG,
-					"Fencing for node %d finished at %ld (>%ld)\n",
+					"Fencing for node %d finished at %ld (lost at %ld)\n",
 					pf_node->nodeid, lft, pf_node->fail_time);
 				list_remove(&pending_fencing, pf_node);
 				free(pf_node);