Attachment 151735 Details for Bug 214477 – patch

[patch] patch

diff-rgmanager-exclusive-fix (text/plain), 1.93 KB, created by Andrey Mirkin on 2007-04-05 06:10:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Mirkin

Created: 2007-04-05 06:10:31 UTC

Size: 1.93 KB

patch

obsolete

>--- ./src/daemons/rg_state.c.rg	2006-10-06 20:30:09.000000000 +0400
>+++ ./src/daemons/rg_state.c	2007-03-27 13:59:19.000000000 +0400
>@@ -42,6 +42,7 @@ int set_rg_state(char *servicename, rg_s
> int get_rg_state(char *servicename, rg_state_t *svcblk);
> void get_recovery_policy(char *rg_name, char *buf, size_t buflen);
> 
>+extern pthread_rwlock_t resource_lock;
> 
> uint64_t
> next_node_id(cluster_member_list_t *membership, uint64_t me)
>@@ -714,6 +715,10 @@ svc_advise_start(rg_state_t *svcStatus, 
> 			ret = 1;
> 			break;
> 		}
>+		if (req == RG_START_RECOVER) {
>+			ret = 1;
>+			break;
>+		}
> 
> 		clulog(LOG_DEBUG, "Not starting disabled RG %s\n",
> 		       svcName);
>@@ -1352,6 +1357,7 @@ exhausted:
> }
> 
> 
>+#define cm_svcexcl  cm_pad[1]
> /**
>  * handle_start_req - Handle a generic start request from a user or during
>  * service manager boot.
>@@ -1367,6 +1373,8 @@ handle_start_req(char *svcName, int req,
> {
> 	int ret, tolerance = FOD_BEST;
> 	cluster_member_list_t *membership = member_list();
>+	cluster_member_t *mp;
>+	int exclusive;
> 
> 	/*
> 	 * When a service request is from a user application (eg, clusvcadm),
>@@ -1382,13 +1390,23 @@ handle_start_req(char *svcName, int req,
> 		cml_free(membership);
> 		return FAIL;
> 	}
>+	pthread_rwlock_rdlock(&resource_lock);
>+	count_resource_groups(membership);
>+	mp = memb_id_to_p(membership, my_id());
>+	assert(mp);
>+	exclusive = mp->cm_svcexcl;
> 	cml_free(membership);
>+	if (exclusive) {
>+		pthread_rwlock_unlock(&resource_lock);
>+		goto relocate;
>+	}
> 	
> 	/*
> 	 * This is a 'root' start request.  We need to clear out our failure
> 	 * mask here - so that we can try all nodes if necessary.
> 	 */
> 	ret = svc_start(svcName, req);
>+	pthread_rwlock_unlock(&resource_lock);
> 
> 	/* 
> 	   If services are locked, return the error 
>@@ -1428,6 +1446,7 @@ handle_start_req(char *svcName, int req,
> 		return RG_EABORT;
> 	}
> 	
>+relocate:
> 	/*
> 	 * OK, it failed to start - but succeeded to stop.  Now,
> 	 * we should relocate the service.

Actions: View | Diff

Attachments on bug 214477: 151735 | 152372 | 152373