Attachment 312490 Details for Bug 456403 – Pass 1 fixing order bug. Untested.

[patch] Pass 1 fixing order bug. Untested.

cman-update-order.patch (text/plain), 976 bytes, created by Lon Hohberger on 2008-07-23 15:31:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2008-07-23 15:31:56 UTC

Size: 976 bytes

patch

obsolete

>diff --git a/fence/fenced/agent.c b/fence/fenced/agent.c
>index 86c5bde..5d3cd29 100644
>--- a/fence/fenced/agent.c
>+++ b/fence/fenced/agent.c
>@@ -291,7 +291,7 @@ void update_cman(char *victim, char *method)
> 
> int dispatch_fence_agent(char *victim, int force)
> {
>-	char *method = NULL, *device = NULL;
>+	char *method = NULL, *device = NULL, *successful_device = NULL;
> 	char *victim_nodename = NULL;
> 	int num_methods, num_devices, m, d, error = -1, cd;
> 
>@@ -347,11 +347,22 @@ int dispatch_fence_agent(char *victim, int force)
> 			if (error)
> 				break;
> 
>-			update_cman(victim, device);
>-			free(device);
>+			if (!successful_device)
>+				successful_device = device;
>+			else
>+				free(device);
> 			device = NULL;
> 		}
> 
>+		if (!error) {
>+			if (successful_device)
>+				update_cman(victim, successful_device);
>+			else
>+				update_cman(victim, "UNKNOWN");
>+		}
>+
>+		if (successful_device)
>+			free(successful_device);
> 		if (device)
> 			free(device);
> 		if (victim_nodename)

Actions: View | Diff

Attachments on bug 456403: 312467 | 312490