cluster: RHEL6 - rgmanager: Fix dependency restart bug in CP mode

Lon Hohberger lon at fedoraproject.org
Wed Feb 22 14:46:47 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4fbd15844e11e3677e865779e57b5943ca6f3c99
Commit:        4fbd15844e11e3677e865779e57b5943ca6f3c99
Parent:        4758c35d2a9862bd7a8ac79d5c2239b6a79ca0bf
Author:        Adam Drew <adrew at redhat.com>
AuthorDate:    Fri Oct 7 12:31:16 2011 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue Feb 21 13:37:11 2012 -0500

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#744824

Signed-off-by: Adam Drew <adrew at redhat.com>
Signed-off-by: Lon Hohberger <lhh at 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 b14f466..c54c068 100644
--- a/rgmanager/src/resources/default_event_script.sl
+++ b/rgmanager/src/resources/default_event_script.sl
@@ -180,6 +180,7 @@ define move_or_start(service, node_list)
                     ((event_type == EVENT_NODE) and (owner == node_id) and
 		     (node_state == 0))) {
 			debug(service, " is not runnable; dependency not met");
+			()=service_stop(service);
 			return ERR_DEPEND;
 		}
 	}


More information about the cluster-commits mailing list