Attachment 945425 Details for Bug 1151199 – rgmanager: Do not restart a service locally after failed relocation if failover domains prohibit it

[patch] rgmanager: Do not restart a service locally after failed relocation if failover domains prohibit it

case1184088-handle_relocate_check_if_illegal_before_local_restart.patch (text/plain), 1.67 KB, created by John Ruemker on 2014-10-09 18:47:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Ruemker

Created: 2014-10-09 18:47:03 UTC

Size: 1.67 KB

patch

obsolete

>diff -up rgmanager-3.0.12.1/rgmanager/src/daemons/rg_state.c.case1184088 rgmanager-3.0.12.1/rgmanager/src/daemons/rg_state.c
>--- rgmanager-3.0.12.1/rgmanager/src/daemons/rg_state.c.case1184088	2014-10-09 12:36:20.802177175 -0400
>+++ rgmanager-3.0.12.1/rgmanager/src/daemons/rg_state.c	2014-10-09 13:44:37.234432627 -0400
>@@ -1959,8 +1959,10 @@ handle_relocate_req(char *svcName, int o
> 
> 	while (memb_count(allowed_nodes)) {
> 		target = best_target_node(allowed_nodes, me, svcName, 1);
>-		if (target == me)
>+		if (target == me) {
>+			free_member_list(allowed_nodes);
> 			goto exhausted;
>+                }
> 
> 		retries = 0;
> retry:
>@@ -2039,13 +2041,29 @@ retry:
> 	 */
> exhausted:
> 	if (!rg_locked()) {
>-		logt_print(LOG_WARNING,
>-		       "#70: Failed to relocate %s; restarting locally\n",
>-		       svcName);
>-		if (svc_start(svcName, RG_START_RECOVER) == 0) {
>-			*new_owner = me;
>-			return RG_ERELO;
>+        	/*
>+	         * We may have originated the relocate request even if we are not
>+        	 * eligible to run the service. Check if we are allowed to start  
>+	         * locally. 
>+        	 */
>+		allowed_nodes = member_list();
>+		if (node_should_start_safe(
>+		    me, allowed_nodes, svcName) == FOD_ILLEGAL) {
>+			logt_print(LOG_ERR, 
>+				"Failed to relocate %s; giving up\n", 
>+	                            svcName);
>+		}
>+		else {
>+			logt_print(LOG_WARNING,
>+		    	       "#70: Failed to relocate %s; restarting locally\n",
>+			           svcName);
>+			if (svc_start(svcName, RG_START_RECOVER) == 0) {
>+				*new_owner = me;
>+				free_member_list(allowed_nodes);
>+				return RG_ERELO;
>+			}
> 		}
>+	        free_member_list(allowed_nodes);
> 	}
> 
> 	if (svc_stop(svcName, RG_STOP) != 0) {

Actions: View | Diff

Attachments on bug 1151199: 945425