Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=a1e906313b85a6... Commit: a1e906313b85a6d0451feda7a6222cfd4386caf5 Parent: b0c42d287f7f749794a61796f016c2e56148d64b Author: Ryan McCabe rmccabe@redhat.com AuthorDate: Fri Nov 30 11:28:57 2012 -0500 Committer: Ryan McCabe rmccabe@redhat.com CommitterDate: Tue Feb 19 11:37:59 2013 -0500
rgmanager: Update status after resource recovery
From John Ruemker jrummy@redhat.com:
"When a service is configured with a recoverable resource, such as nfsclient, a failure of that client correctly triggers the recover function. However, even if recover is successful, rgmanager still stops and recovers the service."
Resolves: rhbz#912625
Acked-by: Lon Hohberger lhh@redhat.com Signed-off-by: Ryan McCabe rmccabe@redhat.com --- rgmanager/src/daemons/restree.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index 367fbb3..ba80247 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -1353,8 +1353,10 @@ do_status(resource_node_t *node) return x;
/* Strange/failed status. Try to recover inline. */ - if ((x = res_exec(node, RS_RECOVER, NULL, 0)) == 0) + if ((x = res_exec(node, RS_RECOVER, NULL, 0)) == 0) { + node->rn_last_status = x; return 0; + }
return x; }
cluster-commits@lists.fedorahosted.org