cluster: STABLE32 - Poll for fenced node updates less aggressively while waiting for fencing to complete.
Ryan McCabe
rmccabe at fedoraproject.org
Tue May 1 13:43:48 UTC 2012
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=124c727e34a946a248af0b8a47e7a2f0d52bd50e
Commit: 124c727e34a946a248af0b8a47e7a2f0d52bd50e
Parent: af8536f05c6d908b1ea8af115a53f5e4f3ae8e79
Author: Ryan McCabe <rmccabe at redhat.com>
AuthorDate: Thu Apr 26 14:16:12 2012 -0400
Committer: Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Thu Apr 26 14:16:12 2012 -0400
Poll for fenced node updates less aggressively while waiting for fencing to complete.
Signed-off-by: Ryan McCabe <rmccabe at redhat.com>
---
rgmanager/src/daemons/cpglockd.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/rgmanager/src/daemons/cpglockd.c b/rgmanager/src/daemons/cpglockd.c
index f101084..5d0fed9 100644
--- a/rgmanager/src/daemons/cpglockd.c
+++ b/rgmanager/src/daemons/cpglockd.c
@@ -1675,17 +1675,14 @@ main(int argc, char **argv)
** don't need to wait for it.
*/
if (!victim && !x && !pf_node->force_wait) {
- int retries = 0;
/* Wait up to 1s for fenced to set victim */
- do {
- usleep(250000);
- if (fenced_node_info(pf_node->nodeid, &fn) < 0) {
- logt_print(LOG_DEBUG,
- "Unable to get fenced data for node %d\n",
- pf_node->nodeid);
- } else
- victim = fn.victim;
- } while (!victim && retries++ < 4);
+ sleep(1);
+ if (fenced_node_info(pf_node->nodeid, &fn) < 0) {
+ logt_print(LOG_DEBUG,
+ "Unable to get fenced data for node %d\n",
+ pf_node->nodeid);
+ } else
+ victim = fn.victim;
if (!victim) {
logt_print(LOG_DEBUG, "First entry in list and victim == 0, removing %d from pending fencing\n", pf_node->nodeid);
More information about the cluster-commits
mailing list