Attachment 597119 Details for Bug 739223 – Errors from ivpsadm should not be fatal.

[patch] Errors from ivpsadm should not be fatal.

piranha-0.8.4-nanny-ipvsadm-errors.patch (text/plain), 2.91 KB, created by Ryan O'Hara on 2012-07-09 17:55:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan O'Hara

Created: 2012-07-09 17:55:51 UTC

Size: 2.91 KB

patch

obsolete

>diff -urN piranha.orig/ipvs_exec.c piranha/ipvs_exec.c
>--- piranha.orig/ipvs_exec.c	2012-07-06 09:36:29.979172234 -0500
>+++ piranha/ipvs_exec.c	2012-07-06 11:04:59.192177508 -0500
>@@ -70,7 +70,6 @@
> 	rc = waitpid (child, &status, 0);
> 
> 	if (!WIFEXITED (status) || WEXITSTATUS (status)) {
>-		piranha_log (flags, (char *) "%s command failed!", cmd);
> 		return 1;
> 	}
> 
>@@ -115,7 +114,9 @@
> 		*argp = NULL;
> 
> 		rc = runCommand (ipvsadm, flags, argv, -1);
>-
>+		if (rc)
>+			piranha_log (flags, (char *) "%s failed to remove %s",
>+				basename (ipvsadm), remoteName);
> 	} 
> 	/* Nothing needs to be done for FOS */
> 	return rc;
>@@ -132,6 +133,7 @@
> 	char remoteName[80];
> 	char weightStr[20];
> 	char fwmStr[20];
>+	int rc = 0;
> 
> 	sprintf (weightStr, "%d", weight);
> 
>@@ -159,7 +161,12 @@
> 	*argp++ = weightStr;
> 	*argp = NULL;
> 
>-	return runCommand (ipvsadm, flags, argv, 0);
>+	rc = runCommand (ipvsadm, flags, argv, 0);
>+	if (rc)
>+		piranha_log (flags, (char *) "%s failed to modify %s",
>+				basename (ipvsadm), remoteName);
>+
>+	return rc;
> }
> 
> int
>@@ -206,6 +213,9 @@
> 		*argp = NULL;
> 
> 		rc = runCommand (ipvsadm, flags, argv, -1);
>+		if (rc)
>+			piranha_log (flags, (char *) "%s failed to add %s",
>+				basename (ipvsadm), remoteName);
> 	}
> 	/* Nothing needs to be done for FOS */
> 	return rc;
>diff -urN piranha.orig/nanny.c piranha/nanny.c
>--- piranha.orig/nanny.c	2012-07-06 09:36:29.992175723 -0500
>+++ piranha/nanny.c	2012-07-06 10:59:52.118323916 -0500
>@@ -1198,20 +1198,13 @@
> 					newWeight = 1;
> 
> 				if (quiesce_srv && isSrvUp) {
>-					if (adjustDevice
>-					    (flags, ipvsadm,
>-					     virtualAddress, port,
>-					     remoteAddr, rport, routingMethod,
>-					     newWeight, fwmark, use_udp))
>-						return -1;
>+					adjustDevice (flags, ipvsadm, virtualAddress, port,
>+						remoteAddr, rport, routingMethod, newWeight,
>+						fwmark, use_udp);
> 				} else {
>-					if (bringUpDev
>-					    (flags, ipvsadm,
>-					     virtualAddress, port,
>-					     remoteAddr, rport, routingMethod,
>-					     newWeight, service_type,
>-					     fwmark, use_udp))
>-						return -1;
>+					bringUpDev (flags, ipvsadm, virtualAddress, port,
>+						remoteAddr, rport, routingMethod, newWeight,
>+						service_type, fwmark, use_udp);
> 					isSrvUp = 1;
> 				}
> 
>@@ -1248,17 +1241,11 @@
> 					     inet_ntoa (*remoteAddr), rport);
> 
> 				if (quiesce_srv && isSrvUp) {
>-					if (adjustDevice
>-					    (flags, ipvsadm,
>-					     virtualAddress, port,
>-					     remoteAddr, rport, routingMethod, 0, fwmark, use_udp))
>-						return -1;
>+					adjustDevice (flags, ipvsadm, virtualAddress, port,
>+						remoteAddr, rport, routingMethod, 0, fwmark, use_udp);
> 				} else {
>-					if (shutdownDev
>-					    (flags, ipvsadm,
>-					     virtualAddress, port,
>-					     remoteAddr, rport, service_type, fwmark, use_udp))
>-						return -1;
>+					shutdownDev (flags, ipvsadm, virtualAddress, port,
>+						remoteAddr, rport, service_type, fwmark, use_udp);
> 					isSrvUp = 0;
> 				}
> 			}

Actions: View | Diff

Attachments on bug 739223: 597119