Attachment 162009 Details for Bug 245381 – Patch. pass 1.

[patch] Patch. pass 1.

rgmanager-245381.patch (text/plain), 2.48 KB, created by Lon Hohberger on 2007-08-21 20:36:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2007-08-21 20:36:44 UTC

Size: 2.48 KB

patch

obsolete

>Index: src/daemons/groups.c
>===================================================================
>RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/groups.c,v
>retrieving revision 1.39
>diff -u -r1.39 groups.c
>--- src/daemons/groups.c	2 Aug 2007 14:53:38 -0000	1.39
>+++ src/daemons/groups.c	21 Aug 2007 20:35:20 -0000
>@@ -1567,13 +1567,23 @@
> 
> 
> void
>-get_recovery_policy(char *rg_name, char *buf, size_t buflen)
>+get_recovery_policy(char *rg_name, char *buf, size_t buflen,
>+		    int *restarts, int *maxrestarts)
> {
> 	resource_t *res;
> 	char *val;
>+	int x, ret;
>+	rg_state_t svcStatus;
>+
>+	ret = get_rg_state_local(rg_name, &svcStatus);
> 
> 	pthread_rwlock_rdlock(&resource_lock);
> 
>+	if (restarts)
>+		*restarts = 0;
>+	if (maxrestarts)
>+		*maxrestarts = 0;
>+
> 	strncpy(buf, "restart", buflen);
> 	res = find_root_by_ref(&_resources, rg_name);
> 	if (res) {
>@@ -1581,6 +1591,14 @@
> 		if (val) {
> 			strncpy(buf, val, buflen);
> 		}
>+		val = res_attr_value(res, "max_restarts");
>+		if (val) {
>+			x = atoi(val);
>+			if (x > 0 && maxrestarts)
>+				*maxrestarts = x;
>+			if (restarts && (ret == 0))
>+				*restarts = svcStatus.rs_restarts;
>+		}
> 	}
> 
> 	pthread_rwlock_unlock(&resource_lock);
>Index: src/daemons/rg_state.c
>===================================================================
>RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/rg_state.c,v
>retrieving revision 1.39
>diff -u -r1.39 rg_state.c
>--- src/daemons/rg_state.c	2 Aug 2007 14:53:38 -0000	1.39
>+++ src/daemons/rg_state.c	21 Aug 2007 20:35:20 -0000
>@@ -50,7 +50,8 @@
> 
> int set_rg_state(char *servicename, rg_state_t *svcblk);
> int get_rg_state(char *servicename, rg_state_t *svcblk);
>-void get_recovery_policy(char *rg_name, char *buf, size_t buflen);
>+void get_recovery_policy(char *rg_name, char *buf, size_t buflen,
>+			 int *restarts, int *maxrestarts);
> int check_depend_safe(char *servicename);
> int group_migratory(char *servicename, int lock);
> int have_exclusive_resources(void);
>@@ -2065,12 +2066,15 @@
> handle_recover_req(char *svcName, int *new_owner)
> {
> 	char policy[20];
>+	int restarts = 0, maxrestarts = 0;
> 
>-	get_recovery_policy(svcName, policy, sizeof(policy));
>+	get_recovery_policy(svcName, policy, sizeof(policy),
>+			    &restarts, &maxrestarts);
> 
> 	if (!strcasecmp(policy, "disable")) {
> 		return svc_disable(svcName);
>-	} else if (!strcasecmp(policy, "relocate")) {
>+	} else if (!strcasecmp(policy, "relocate") ||
>+		   (maxrestarts && (restarts >= maxrestarts))) {
> 		return handle_relocate_req(svcName, RG_START_RECOVER, -1,
> 					   new_owner);
> 	}

Actions: View | Diff

Attachments on bug 245381: 162009 | 162010