cluster: RHEL56 - rgmanager: Allow restart,disable recovery policy

Lon Hohberger lon at fedoraproject.org
Fri Sep 24 22:20:58 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f17eaaf6827237cd13d9086e7b1fbd6eaf702db1
Commit:        f17eaaf6827237cd13d9086e7b1fbd6eaf702db1
Parent:        c1de3c2fc07a756a6c96dbe6ebe17257b1e08d52
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Thu Sep 2 15:06:09 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Fri Sep 24 16:16:03 2010 -0400

rgmanager: Allow restart,disable recovery policy

This policy allows administrators to allow
rgmanager to start and monitor services
where failover is not required.

Resolves: rhbz#605733

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/daemons/rg_state.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 020b47c..8af6c7e 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -2296,6 +2296,13 @@ handle_recover_req(char *svcName, int *new_owner)
 	/* Check restart counter/timer for this resource */
 	if (check_restart(svcName) > 0) {
 		clear_restart(svcName);
+
+		if (strstr(policy, "disable")) {
+			clulog(LOG_NOTICE,
+			       "Restart threshold for %s exceeded; "
+			       "disabling\n", svcName);
+			return svc_disable(svcName);
+		}
 		clulog(LOG_NOTICE, "Restart threshold for %s exceeded; "
 		       "attempting to relocate\n", svcName);
 		return handle_relocate_req(svcName, RG_START_RECOVER, -1,


More information about the cluster-commits mailing list