From 06993e7d6253dbb9a0e83c8edeba4d7a99f61954 Mon Sep 17 00:00:00 2001
From: Lon Hohberger <lhh@redhat.com>
Date: Wed, 8 Sep 2010 15:56:28 -0400
Subject: [PATCH] rgmanager: Fix handling of independent subtrees

Independent subtrees were not getting handled
correctly in all cases.  This prevented correct
recovery (e.g. stop) of resources which failed
when an ancestor was an independent subtree.

Resolves: rhbz#605733

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/daemons/restree.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c
index 3a03f91..ea458d6 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -1189,8 +1189,8 @@ mark_nodes(resource_node_t *node, int state, int setflags, int clearflags)
 	resource_node_t *child;
 
 	list_for(&node->rn_child, child, x) {
-		if (child->rn_child)
-			mark_nodes(child->rn_child, state, setflags,
+		if (child)
+			mark_nodes(child, state, setflags,
 				   clearflags);
 	}
 
@@ -1415,7 +1415,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree,
 			printf("Node %s:%s - Convalesce\n",
 			       node->rn_resource->r_rule->rr_type,
 			       primary_attr_value(node->rn_resource));
-			node->rn_state = RES_STOPPED;
+			mark_nodes(node, RES_STOPPED, RF_NEEDSTART, 0);
 			op = RS_START;
 		}
 
@@ -1510,8 +1510,10 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree,
 			return SFL_FAILURE;
 		}
 
-		if (node->rn_state != RES_DISABLED)
-			mark_nodes(node, RES_STARTED, 0, RF_NEEDSTOP);
+		if (node->rn_state != RES_DISABLED) {
+			node->rn_state = RES_STARTED;
+			node->rn_flags &= ~RF_NEEDSTOP;
+		}
 	}
 
        if (node->rn_child) {
@@ -1523,7 +1525,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree,
 		  and all our children as failed and return a flag stating
 		  that this section is recoverable apart from siblings in
 		  the resource tree. */
-		if (op == RS_STATUS && (rv & SFL_FAILURE) &&
+		if (op == RS_STATUS && (rv & (SFL_FAILURE|SFL_RECOVERABLE)) &&
 		    (node->rn_flags & RF_INDEPENDENT)) {
 			rv = SFL_RECOVERABLE;
 			if (node->rn_flags & RF_NON_CRITICAL) {
@@ -1560,8 +1562,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree,
 		}
 		pthread_mutex_unlock(&node->rn_resource->r_mutex);
 
-		if (node->rn_flags & RF_QUIESCE &&
-		    node->rn_flags & RF_NON_CRITICAL) {
+		if (node->rn_flags & RF_QUIESCE) {
 			node->rn_flags &= ~RF_QUIESCE;
 			node->rn_state = RES_DISABLED;
 		} else {
-- 
1.7.2.2