cluster: STABLE32 - rgmanager: Fix return code when a service would deadlock

Ryan McCabe rmccabe at fedoraproject.org
Sat Oct 13 01:15:40 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=a844e71abe9da79e7b6830449e3f5d5d8fed1224
Commit:        a844e71abe9da79e7b6830449e3f5d5d8fed1224
Parent:        cdd37c317a1b0ebfb4daaf56f5a6beac20356792
Author:        Ryan McCabe <rmccabe at redhat.com>
AuthorDate:    Fri Oct 12 21:14:19 2012 -0400
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Fri Oct 12 21:14:19 2012 -0400

rgmanager: Fix return code when a service would deadlock

When we detect that starting a service would cause a deadlock, return 0
instead of -1. This fixes a crash that occurred when -1 was returned.

Signed-off-by: Ryan McCabe <rmccabe at redhat.com>
---
 rgmanager/src/daemons/rg_thread.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c
index 31f289c..4f46c25 100644
--- a/rgmanager/src/daemons/rg_thread.c
+++ b/rgmanager/src/daemons/rg_thread.c
@@ -759,7 +759,7 @@ rt_enqueue_request(const char *resgroupname, int request,
 		logt_print(LOG_DEBUG,
 			"Failed to queue %d request for %s: Would block\n",
 			request, resgroupname);
-		return -1;
+		return 0;
 	}
 
 	ret = rq_queue_request(resgroup->rt_queue, resgroup->rt_name,


More information about the cluster-commits mailing list