Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=871... Commit: 87176e1e6c6ac1b83f719c4683e0dd9745cac411 Parent: 2ee5b3c42eb023692b3a6ca0d2b6241a2ef3b872 Author: Lon Hohberger lhh@redhat.com AuthorDate: Tue Apr 26 10:54:48 2011 -0400 Committer: Lon Hohberger lhh@redhat.com CommitterDate: Wed Apr 27 17:52:47 2011 -0400

rgmanager: Fix reference count handling

rgmanager feeds reference counts to resource-agents so they can track when to actually clean up (i.e. when there are no other references). A problem was found where rgmanager was incorrectly presenting a higher reference count than expected while stopping, preventing multi-instance resources (specifically clusterfs.sh) from cleaning up.

Resolves: rhbz#692771

Signed-off-by: Lon Hohberger lhh@redhat.com Reviewed-by: Ryan O'Hara rohara@redhat.com --- rgmanager/src/daemons/restree.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index a1358f7..697c7b1 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -381,6 +381,7 @@ res_exec(resource_node_t *node, int op, const char *arg, int depth) int childpid, pid; int ret = 0; int act_index; + int inc = node->rn_resource->r_incarnations; time_t sleeptime = 0, timeout = 0; char **env = NULL; resource_t *res = node->rn_resource; @@ -404,8 +405,15 @@ res_exec(resource_node_t *node, int op, const char *arg, int depth) if (!(node->rn_flags & RF_ENFORCE_TIMEOUTS)) timeout = node->rn_actions[act_index].ra_timeout;

+ /* rgmanager ref counts are designed to track *other* incarnations + on the host. So, if we're started/failed, the RA should not count + this incarnation */ + if (inc && (node->rn_state == RES_STARTED || + node->rn_state == RES_FAILED)) + --inc; + #ifdef DEBUG - env = build_env(node, depth, node->rn_resource->r_incarnations, (int)timeout); + env = build_env(node, depth, inc, (int)timeout); if (!env) return -errno; #endif @@ -434,7 +442,7 @@ res_exec(resource_node_t *node, int op, const char *arg, int depth) #endif

#ifndef DEBUG - env = build_env(node, depth, node->rn_resource->r_incarnations, (int)timeout); + env = build_env(node, depth, inc, (int)timeout); #endif

if (!env)