Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=bd81c6f65aac30... Commit: bd81c6f65aac30aaeb6d3eb129eab6ee3512d40c Parent: 804b8fe92e31b076b9989affaefaf4e739a5e342 Author: Ryan McCabe rmccabe@redhat.com AuthorDate: Fri Nov 30 11:28:57 2012 -0500 Committer: Ryan McCabe rmccabe@redhat.com CommitterDate: Fri Nov 30 11:28:57 2012 -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."
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 82f8f29..b46986d 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -1302,8 +1302,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