cluster: RHEL6 - Revert "rgmanager: Fix bad passing of SFL_FAILURE up"

Lon Hohberger lon at fedoraproject.org
Fri Jul 8 16:57:57 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=516ed9a5d2bd4a350e6876ee680be7925350e670
Commit:        516ed9a5d2bd4a350e6876ee680be7925350e670
Parent:        ef342f0e8ff753d8ecb8e84f2d36807008848594
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Fri Jul 8 12:56:51 2011 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Fri Jul 8 12:56:51 2011 -0400

Revert "rgmanager: Fix bad passing of SFL_FAILURE up"

This reverts commit ef342f0e8ff753d8ecb8e84f2d36807008848594.

Wrong bugzilla #.
---
 rgmanager/src/daemons/restree.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c
index a13f907..3892ab9 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -1548,7 +1548,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)) {
 
 			rte = restart_threshold_exceeded(node->rn_restart_counter);


More information about the cluster-commits mailing list