From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio M. Di Nitto Date: Fri, 24 Jun 2011 14:28:17 +0200 Subject: [Cluster-devel] [PATCH] rgmanager: Fix bad passing of SFL_FAILURE up - RHEL5 In-Reply-To: <1308851160-18455-1-git-send-email-lhh@redhat.com> References: <1308851160-18455-1-git-send-email-lhh@redhat.com> Message-ID: <4E0482E1.9010700@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit ACK On 6/23/2011 7:46 PM, Lon Hohberger wrote: > 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 > --- > 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);