Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > e536fc0c6270ec1d92a0fd41bb1f8360 > files > 74

rgmanager-2.0.52-28.el5_8.2.src.rpm

From 5a67bbf795db62d9b20179f96b0ad17066cae4cd Mon Sep 17 00:00:00 2001
From: Adam Drew <adrew@redhat.com>
Date: Fri, 7 Oct 2011 12:31:16 -0400
Subject: [PATCH] rgmanager: Fix dependency restart bug in CP mode

If we:
 - had central_processing mode enabled,
 - had a service with 'depend' set on another
   service,
 - we attempted to restart the service with the
   dependency, and
 - the dependency was missing

rgmanager would leave the state in 'recovering'

This is the corrected patch from Adam.

Resolves: rhbz#743442

Signed-off-by: Adam Drew <adrew@redhat.com>
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/resources/default_event_script.sl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl
index d567465..cdde066 100644
--- a/rgmanager/src/resources/default_event_script.sl
+++ b/rgmanager/src/resources/default_event_script.sl
@@ -158,6 +158,7 @@ define move_or_start(service, node_list)
 		(,,, owner, state) = service_status(depends);
 		if (owner < 0) {
 			debug(service, " is not runnable; dependency not met");
+			()=service_stop(service);
 			return ERR_DEPEND;
 		}
 	}
-- 
1.7.3.4