Hello,
The following two patches (kernel space and user space man page fixes)
address the 3/4 threshold cut-off when lower threshold is not set.
diff-tree fdb7185... (from bc22290...)
Author: Roberto Nibali <ratz@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 29 17:00:04 2005 +0100
[IPVS]: Remove 3/4 threshold cut-off when the lower threshold is
not set
There is no reason to change the semantics of upper and lower threshold
handling when the lower threshold limit is not set (meaning 0). The
original
semantics to re-introduce a real server as soon as the lower
threshold limit
is hit with the connection counter should apply generally. This
patch revert
the original semantics to a more intuitive one.
Signed-off-by: Roberto Nibali <ratz@xxxxxxxxxxxx>
Please consider applying,
Roberto Nibali, ratz
--
echo '[q]sa[ln0=aln256%Pln256/snlbx]sb3135071790101768542287578439snlbxq'|dc
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
index 18b65c5..f97aaa7 100644
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
@@ -458,12 +458,12 @@ static inline void ip_vs_unbind_dest(str
}
if (dest->l_threshold != 0) {
+ /* This implies that the upper threshold is >0 as well */
if (ip_vs_dest_totalconns(dest) < dest->l_threshold)
dest->flags &= ~IP_VS_DEST_F_OVERLOAD;
- } else if (dest->u_threshold != 0) {
- if (ip_vs_dest_totalconns(dest) * 4 < dest->u_threshold * 3)
- dest->flags &= ~IP_VS_DEST_F_OVERLOAD;
} else {
+ /* We drop in here if the upper threshold is >0 and the lower
+ threshold is equal 0. */
if (dest->flags & IP_VS_DEST_F_OVERLOAD)
dest->flags &= ~IP_VS_DEST_F_OVERLOAD;
}
diff -ur ipvsadm-1.24/ipvsadm.8 ipvsadm-1.24-ratz/ipvsadm.8
--- ipvsadm-1.24/ipvsadm.8 2005-12-10 17:00:07.000000000 +0100
+++ ipvsadm-1.24-ratz/ipvsadm.8 2005-12-29 15:57:56.000000000 +0100
@@ -312,7 +312,7 @@
servers are added or modified.
.TP
.B -w, --weight \fIweight\fP
-\fIWeight\fP is an integer specifying the capacity of a server
+\fIWeight\fP is an integer specifying the capacity of a server
relative to the others in the pool. The valid values of \fIweight\fP
are 0 through to 65535. The default is 1. Quiescent servers are
specified with a weight of zero. A quiescent server will receive no
@@ -335,10 +335,7 @@
through to 65535. The default is 0, which means the lower connection
threshold is not set. If \fIlthreshold\fP is set with other values,
the server will receive new connections when the number of its
-connections drops below its lower connection threshold. If
-\fIlthreshold\fP is not set but \fIuthreshold\fP is set, the server
-will receive new connections when the number of its connections drops
-below three forth of its upper connection threshold.
+connections drops below its lower connection threshold.
.TP
.B --mcast-interface \fIinterface\fP
Specify the multicast interface that the sync master daemon sends
|