cluster: RHEL6 - rgmanager: Update status after resource recovery

Ryan McCabe rmccabe at fedoraproject.org
Fri Nov 30 16:32:41 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=2616b150da0fb5e6bb24f9d3483b52ea3a89ef82
Commit:        2616b150da0fb5e6bb24f9d3483b52ea3a89ef82
Parent:        44547c338ae73be3c724629c97802e4ea2e942b1
Author:        Ryan McCabe <rmccabe at redhat.com>
AuthorDate:    Fri Nov 30 11:28:57 2012 -0500
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Fri Nov 30 11:32:22 2012 -0500

rgmanager: Update status after resource recovery

>From John Ruemker <jrummy at 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#879031

Acked-by: Lon Hohberger <lhh at redhat.com>
Signed-off-by: Ryan McCabe <rmccabe at 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 9cd38a2..ea5e1c5 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -1298,8 +1298,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;
 }


More information about the cluster-commits mailing list