Attachment 150499 Details for Bug 208830 – massaged version of the patch for RHEL4

[patch] massaged version of the patch for RHEL4

linux-kernel-test.patch (text/plain), 1.97 KB, created by Neil Horman on 2007-03-20 15:51:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-03-20 15:51:31 UTC

Size: 1.97 KB

patch

obsolete

>--- linux-2.6.9/include/net/ip_vs.h.orig	2004-10-18 17:53:06.000000000 -0400
>+++ linux-2.6.9/include/net/ip_vs.h	2007-03-20 11:49:00.000000000 -0400
>@@ -358,6 +358,7 @@
> 	NET_IPV4_VS_EXPIRE_NODEST_CONN=23,
> 	NET_IPV4_VS_SYNC_THRESHOLD=24,
> 	NET_IPV4_VS_NAT_ICMP_SEND=25,
>+	NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE=26,
> 	NET_IPV4_VS_LAST
> };
> 
>@@ -879,6 +880,7 @@
>  */
> extern int sysctl_ip_vs_cache_bypass;
> extern int sysctl_ip_vs_expire_nodest_conn;
>+extern int sysctl_ip_vs_expire_quiescent_template;
> extern int sysctl_ip_vs_sync_threshold[2];
> extern int sysctl_ip_vs_nat_icmp_send;
> extern struct ip_vs_stats ip_vs_stats;
>--- linux-2.6.9/net/ipv4/ipvs/ip_vs_conn.c.orig	2007-03-20 11:38:30.000000000 -0400
>+++ linux-2.6.9/net/ipv4/ipvs/ip_vs_conn.c	2007-03-20 11:49:00.000000000 -0400
>@@ -453,7 +453,9 @@
> 	 * Checking the dest server status.
> 	 */
> 	if ((dest == NULL) ||
>-	    !(dest->flags & IP_VS_DEST_F_AVAILABLE)) {
>+	    !(dest->flags & IP_VS_DEST_F_AVAILABLE) || 
>+	    (sysctl_ip_vs_expire_quiescent_template && 
>+	     (atomic_read(&dest->weight) == 0))) {
> 		IP_VS_DBG(9, "check_template: dest not available for "
> 			  "protocol %s s:%u.%u.%u.%u:%d v:%u.%u.%u.%u:%d "
> 			  "-> d:%u.%u.%u.%u:%d\n",
>--- linux-2.6.9/net/ipv4/ipvs/ip_vs_ctl.c.orig	2007-03-20 11:38:30.000000000 -0400
>+++ linux-2.6.9/net/ipv4/ipvs/ip_vs_ctl.c	2007-03-20 11:49:00.000000000 -0400
>@@ -75,6 +75,7 @@
> static int sysctl_ip_vs_am_droprate = 10;
> int sysctl_ip_vs_cache_bypass = 0;
> int sysctl_ip_vs_expire_nodest_conn = 0;
>+int sysctl_ip_vs_expire_quiescent_template = 0;
> int sysctl_ip_vs_sync_threshold[2] = { 3, 50 };
> int sysctl_ip_vs_nat_icmp_send = 0;
> 
>@@ -1574,6 +1575,13 @@
> 		.maxlen		= sizeof(int),
> 		.mode		= 0644,
> 		.proc_handler	= &proc_dointvec,
>+
>+		.ctl_name	= NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE,
>+		.procname	= "expire_quiescent_template",
>+		.data		= &sysctl_ip_vs_expire_quiescent_template,
>+		.maxlen		= sizeof(int),
>+		.mode		= 0644,
>+		.proc_handler	= &proc_dointvec,
> 	},
> 	{ .ctl_name = 0 }
> };

Actions: View | Diff

Attachments on bug 208830: 138115 | 150499