Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=199... Commit: 199101a3d89bc14ff99394f69cd0861b37b862b3 Parent: 6329b3688fca66f5821dedb3f98268c06d2ef122 Author: Ryan McCabe rmccabe@redhat.com AuthorDate: Mon May 14 10:34:48 2012 -0400 Committer: Ryan McCabe rmccabe@redhat.com CommitterDate: Mon May 14 10:34:48 2012 -0400
cpglockd: Fix a hang triggered when fencing completes in less than 1s
Signed-off-by: Ryan McCabe rmccabe@redhat.com --- 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);
cluster-commits@lists.fedorahosted.org