Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c8c... Commit: c8c6238a72125e1dbc62186fb246f8a0d5dc0a66 Parent: 9be62ccbea876e67b8ad4bb3c1b4203feb4fc1f7 Author: Lon Hohberger lhh@redhat.com AuthorDate: Thu Jun 23 10:36:09 2011 -0400 Committer: Lon Hohberger lhh@redhat.com CommitterDate: Fri Jun 24 08:22:09 2011 -0400

rgmanager: Fix bad passing of SFL_FAILURE up

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

Resolves: rhbz#711521

Signed-off-by: Lon Hohberger lhh@redhat.com Reviewed-by: Bob Peterson rpeterso@redhat.com --- 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 697c7b1..4e5f3bc 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -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);