From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17109 invoked by alias); 22 Jun 2009 13:34:03 -0000 Received: (qmail 17083 invoked by alias); 22 Jun 2009 13:34:02 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - rgmanager: Fix leaked context on queue fail To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: ecabf4059c7a731ca3cd154647c104660e3b649f X-Git-Newrev: 6a9c8dbb44439d57a9da92990619a1d47c081136 From: Lon Hohberger Message-Id: <20090622133327.A48421201EF@lists.fedorahosted.org> Date: Mon, 22 Jun 2009 13:34:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00596.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6a9c8dbb44439d57a9da92990619a1d47c081136 Commit: 6a9c8dbb44439d57a9da92990619a1d47c081136 Parent: ecabf4059c7a731ca3cd154647c104660e3b649f Author: Lon Hohberger AuthorDate: Fri Jun 19 17:02:53 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Jun 22 09:32:03 2009 -0400 rgmanager: Fix leaked context on queue fail Signed-off-by: Lon Hohberger --- rgmanager/src/daemons/main.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 4082743..8f9fc2f 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -458,11 +458,20 @@ dispatch_msg(msgctx_t *ctx, int nodeid, int need_close) /* Distributed processing and/or request is from master node -- Queue request */ - rt_enqueue_request(msg_sm->sm_data.d_svcName, - msg_sm->sm_data.d_action, - ctx, 0, msg_sm->sm_data.d_svcOwner, - msg_sm->sm_hdr.gh_arg1, - msg_sm->sm_hdr.gh_arg2); + if (rt_enqueue_request(msg_sm->sm_data.d_svcName, + msg_sm->sm_data.d_action, + ctx, 0, msg_sm->sm_data.d_svcOwner, + msg_sm->sm_hdr.gh_arg1, + msg_sm->sm_hdr.gh_arg2) != 0) { + + /* Clean up this context if we fail to + * queue the request. */ + send_ret(ctx, msg_sm->sm_data.d_svcName, + RG_EAGAIN, msg_sm->sm_data.d_action, 0); + need_close = 1; + ret = 0; + goto out; + } return 0; case RG_EVENT: