cluster: RHEL56 - rgmanager: Retry when config is out of sync

[Lon Hohberger]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        a4ced3c53b65320f4c67ae5cd53a70e61a32e796
Parent:        801c034863c137ad3dbf3f057057b12f61a79df5
Author:        Lon Hohberger <lhh(a)redhat.com&gt;
AuthorDate:    Thu Aug 5 16:53:22 2010 -0400
Committer:     Lon Hohberger <lhh(a)redhat.com&gt;
CommitterDate: Mon Aug 9 10:22:47 2010 -0400

rgmanager: Retry when config is out of sync

If you add a service to rgmanager v1 or v2 and that
service fails to start on the first node but succeeds
in its initial stop operation, there is a chance that
the remote instance of rgmanager has not yet reread
the configuration, causing the service to be placed
into the 'recovering' state without further action.

This patch causes the originator of the request to
retry the operation.

Later versions of rgmanager (ex STABLE3 branch and
derivatives) are unlikely to have this problem since
configuration updates are not polled, but rather
delivered to clients.

Resolves: rhbz#568126

Signed-off-by: Lon Hohberger <lhh(a)redhat.com&gt;
---
 rgmanager/src/daemons/rg_state.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 66ed85f..a4fe15e 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -1725,6 +1725,7 @@ handle_relocate_req(char *svcName, int orig_request, int
preferred_target,
 	rg_state_t svcStatus;
 	int target = preferred_target, me = my_id();
 	int ret, x, request = orig_request;
+	int retries;
 	
 	get_rg_state_local(svcName, &svcStatus);
 	if (svcStatus.rs_state == RG_STATE_DISABLED ||
@@ -1855,6 +1856,8 @@ handle_relocate_req(char *svcName, int orig_request, int
preferred_target,
 		if (target == me)
 			goto exhausted;
 
+		retries = 0;
+retry:
 		ret = svc_start_remote(svcName, request, target);
 		switch (ret) {
 		case RG_ERUN:
@@ -1864,6 +1867,21 @@ handle_relocate_req(char *svcName, int orig_request, int
preferred_target,
 			*new_owner = svcStatus.rs_owner;
 			free_member_list(allowed_nodes);
 			return 0;
+		case RG_ENOSERVICE:
+			/*
+			 * Configuration update pending on remote node?  Give it
+			 * a few seconds to sync up.  rhbz#568126
+			 *
+			 * Configuration updates are synchronized in later releases
+			 * of rgmanager; this should not be needed.
+			 */
+			if (retries++ < 4) {
+				sleep(3);
+				goto retry;
+			}
+			clulog(LOG_WARNING, "Member #%d has a different configuration"
+			       " than I do; trying next member.", target);
+			/* Deliberate */
 		case RG_EDEPEND:
 		case RG_EFAIL:
 			/* Uh oh - we failed to relocate to this node.