From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18106 invoked by alias); 11 Aug 2009 19:29:06 -0000 Received: (qmail 18100 invoked by alias); 11 Aug 2009 19:29:06 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_63,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_63,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: rgmanager: master - rgmanager: Fix incarnation handling To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: rgmanager.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7310545c230d441b9aa413d1ebd320cf01a3bc4d X-Git-Newrev: 52ae93b6f6f90893b550eb7eba3cb5e84bdad499 From: Lon Hohberger Message-Id: <20090811192840.B43A41201D6@lists.fedorahosted.org> Date: Tue, 11 Aug 2009 19:29: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-q3/txt/msg00187.txt.bz2 Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=52ae93b6f6f90893b550eb7eba3cb5e84bdad499 Commit: 52ae93b6f6f90893b550eb7eba3cb5e84bdad499 Parent: 7310545c230d441b9aa413d1ebd320cf01a3bc4d Author: Lon Hohberger AuthorDate: Fri Jul 31 15:42:58 2009 -0400 Committer: Lon Hohberger CommitterDate: Tue Aug 11 15:28:27 2009 -0400 rgmanager: Fix incarnation handling * Don't allow simultaneous starts/stops of the *same* resource. * Make incarnation numbers consistent between start/stop Red Hat Bugzilla #506094, part 3/3 Signed-off-by: Lon Hohberger --- rgmanager/include/reslist.h | 1 + rgmanager/src/daemons/reslist.c | 1 + rgmanager/src/daemons/restree.c | 20 +++++++++++++++++++- 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h index 5600cf5..08ab215 100644 --- a/rgmanager/include/reslist.h +++ b/rgmanager/include/reslist.h @@ -88,6 +88,7 @@ typedef struct _resource_rule { typedef struct _resource { list_head(); + pthread_mutex_t r_mutex; resource_rule_t * r_rule; char * r_name; resource_attr_t * r_attrs; diff --git a/rgmanager/src/daemons/reslist.c b/rgmanager/src/daemons/reslist.c index b77d545..4656e43 100644 --- a/rgmanager/src/daemons/reslist.c +++ b/rgmanager/src/daemons/reslist.c @@ -731,6 +731,7 @@ load_resource(int ccsfd, resource_rule_t *rule, char *base) } memset(res, 0, sizeof(*res)); + pthread_mutex_init(&res->r_mutex, NULL); res->r_rule = rule; for (x = 0; res->r_rule->rr_attrs && diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index 4c8225a..226d05d 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -1292,6 +1292,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, /* Start starts before children */ if (me && (op == RS_START)) { + pthread_mutex_lock(&node->rn_resource->r_mutex); if (node->rn_flags & RF_RECONFIG && realop == RS_CONDSTART) { rv = res_exec(node, RS_RECONFIG, NULL, 0); @@ -1302,6 +1303,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, node->rn_flags &= ~(RF_NEEDSTART | RF_RECONFIG); if (rv != 0) { node->rn_state = RES_FAILED; + pthread_mutex_unlock(&node->rn_resource->r_mutex); return SFL_FAILURE; } @@ -1312,6 +1314,8 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, ++node->rn_resource->r_incarnations; node->rn_state = RES_STARTED; } + pthread_mutex_unlock(&node->rn_resource->r_mutex); + } else if (me && (op == RS_STATUS || op == RS_STATUS_INQUIRY)) { /* Special quick-check for status inquiry */ @@ -1369,16 +1373,30 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, /* Stop should occur after children have stopped */ if (me && (op == RS_STOP)) { + + /* Decrease incarnations so the script knows how many *other* + incarnations there are. */ + pthread_mutex_lock(&node->rn_resource->r_mutex); + if (node->rn_state == RES_STARTED) { + assert(node->rn_resource->r_incarnations > 0); + --node->rn_resource->r_incarnations; + } + node->rn_flags &= ~RF_NEEDSTOP; rv |= res_exec(node, op, NULL, 0); if (rv != 0) { + if (node->rn_state == RES_STARTED) { + /* Fail to stop: fix incarnations */ + ++node->rn_resource->r_incarnations; + } node->rn_state = RES_FAILED; + pthread_mutex_unlock(&node->rn_resource->r_mutex); return SFL_FAILURE; } + pthread_mutex_unlock(&node->rn_resource->r_mutex); if (node->rn_state != RES_STOPPED) { - --node->rn_resource->r_incarnations; node->rn_state = RES_STOPPED; } }