cluster: STABLE32 - rgmanager: Fix for deadlock

[Ryan McCabe]

Gitweb:       
http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=b17d6ffc82e...
Commit:        b17d6ffc82e75553cfee7c2fd21d3bbdac0d1e86
Parent:        05b6c764abb3e8e6f406bd8f33df8000206bd986
Author:        Ryan McCabe <rmccabe(a)redhat.com&gt;
AuthorDate:    Thu Sep 27 15:07:15 2012 -0400
Committer:     Ryan McCabe <rmccabe(a)redhat.com&gt;
CommitterDate: Thu Sep 27 15:07:15 2012 -0400

rgmanager: Fix for deadlock

This patch fixes a deadlock in rgmanager that could occur when a node
starts rgmanager while a service is recovering.

Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com&gt;
---
 rgmanager/src/daemons/rg_state.c   |    1 +
 rgmanager/src/daemons/rg_thread.c  |   19 ++++++++++++++++++-
 rgmanager/src/daemons/service_op.c |    1 +
 3 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 30470ac..9f0c68e 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -1979,6 +1979,7 @@ retry:
 			/* Deliberate */
 		case RG_EDEPEND:
 		case RG_EFAIL:
+		case RG_EDEADLCK:
 			/* Uh oh - we failed to relocate to this node.
 			   ensure that we tell the next node to start it from
 			   the 'recovering' state. */
diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c
index a7bf3f9..31f289c 100644
--- a/rgmanager/src/daemons/rg_thread.c
+++ b/rgmanager/src/daemons/rg_thread.c
@@ -9,6 +9,8 @@
 #include <rg_queue.h>
 #include <assert.h>
 #include <members.h>
+#include <liblogthread.h>
+
 
 /**
  * Resource thread list entry.
@@ -738,13 +740,28 @@ rt_enqueue_request(const char *resgroupname, int request,
 			ret = 0;
 			break;
 		}
-		fprintf(stderr, "Failed to queue request: Would block\n");
 		/* EWOULDBLOCK */
 		pthread_mutex_unlock(resgroup->rt_queue_mutex);
 		pthread_mutex_unlock(&reslist_mutex);
+		logt_print(LOG_DEBUG,
+			"Failed to queue %d request for %s: Would block\n",
+			request, resgroupname);
 		return ret;
 	}
 
+	if (resgroup->rt_request == RG_START &&
+	    (request == RG_START_REMOTE || request == RG_START_RECOVER)) {
+		send_ret(response_ctx, resgroup->rt_name, RG_EDEADLCK,
+			request, 0);
+		msg_free_ctx(response_ctx);
+		pthread_mutex_unlock(resgroup->rt_queue_mutex);
+		pthread_mutex_unlock(&reslist_mutex);
+		logt_print(LOG_DEBUG,
+			"Failed to queue %d request for %s: Would block\n",
+			request, resgroupname);
+		return -1;
+	}
+
 	ret = rq_queue_request(resgroup->rt_queue, resgroup->rt_name,
 			       request, 0, 0, response_ctx, 0, target,
 			       arg0, arg1);
diff --git a/rgmanager/src/daemons/service_op.c b/rgmanager/src/daemons/service_op.c
index f094129..4b74427 100644
--- a/rgmanager/src/daemons/service_op.c
+++ b/rgmanager/src/daemons/service_op.c
@@ -62,6 +62,7 @@ service_op_start(char *svcName,
 			++dep;
 			continue;
 		case RG_EFAIL:
+		case RG_EDEADLCK:
 			++fail;
 			continue;
 		case RG_EABORT: