Skip to contentSkip to conversation

rgmanager: Fix bad passing of SFL_FAILURE up - RHEL5

PATCH New Lon Hohberger 2 participants 2 messages Jun 23, 2011 – Jun 24, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rgmanager: Fix bad passing of SFL_FAILURE up - RHEL5

We were handling failures at the 'highest' independent subtree level instead of lowest; this patch fixes that.

Resolves: rhbz#711521

---
 rgmanager/src/daemons/restree.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
rgmanager/src/daemons/restree.c +1 -1
index 697c7b1..4e5f3bc 100644
@@ -1603,7 +1603,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|SFL_RECOVERABLE)) &&
+		if (op == RS_STATUS && (rv & SFL_FAILURE) &&
 		    (node->rn_flags & RF_INDEPENDENT)) {
 
 			rte = restart_threshold_exceeded(node->rn_restart_counter);
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 1/1 rgmanager: Fix bad passing of SFL_FAILURE up - RHEL5

ACK

Quoted 23 lines · Lon Hohberger

We were handling failures at the 'highest' independent subtree level instead of lowest; this patch fixes that.

Resolves: rhbz#711521

---
 rgmanager/src/daemons/restree.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
rgmanager/src/daemons/restree.c +1 -1
index 697c7b1..4e5f3bc 100644
@@ -1603,7 +1603,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|SFL_RECOVERABLE)) &&
+		if (op == RS_STATUS && (rv & SFL_FAILURE) &&
 		    (node->rn_flags & RF_INDEPENDENT)) {
 
 			rte = restart_threshold_exceeded(node->rn_restart_counter);