In some situation, we want to reap all the active connections
to a host that is failing. Setting its weight to zero only stop new
connections to the destination while still forwarding packets part of
an active one.
We need a finer grained version of the sysctl_expire_nodest_conn because
in most case we want to kept the behavior of only blocking new connexion.
But if one host destination is failing we want to cut the traffic to
that one immediately. Sending a RST is preferable than blackholling packets
in that case.
Signed-off-by: Yannick Brosseau <scientist@xxxxxx>
---
net/netfilter/ipvs/ip_vs_core.c | 3 ++-
net/netfilter/ipvs/ip_vs_ctl.c | 14 +++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 5d2b806..b24791f 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -1718,7 +1718,8 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
if (cp->dest && !(cp->dest->flags & IP_VS_DEST_F_AVAILABLE)) {
/* the destination server is not available */
- if (sysctl_expire_nodest_conn(ipvs)) {
+ if (sysctl_expire_nodest_conn(ipvs) ||
+ atomic_read(&cp->dest->weight) == -1) {
/* try to expire the connection immediately */
ip_vs_conn_expire_now(cp);
}
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 4953267..e1a8c39 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -829,7 +829,11 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
}
/* set the dest status flags */
- dest->flags |= IP_VS_DEST_F_AVAILABLE;
+ if (atomic_read(&dest->weight) >= 0) {
+ dest->flags |= IP_VS_DEST_F_AVAILABLE;
+ } else {
+ dest->flags &= ~IP_VS_DEST_F_AVAILABLE;
+ }
if (udest->u_threshold == 0 || udest->u_threshold > dest->u_threshold)
dest->flags &= ~IP_VS_DEST_F_OVERLOAD;
@@ -939,8 +943,8 @@ ip_vs_add_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest)
EnterFunction(2);
- if (udest->weight < 0) {
- pr_err("%s(): server weight less than zero\n", __func__);
+ if (udest->weight < -1) {
+ pr_err("%s(): server weight less than -1\n", __func__);
return -ERANGE;
}
@@ -1003,8 +1007,8 @@ ip_vs_edit_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest)
EnterFunction(2);
- if (udest->weight < 0) {
- pr_err("%s(): server weight less than zero\n", __func__);
+ if (udest->weight < -1) {
+ pr_err("%s(): server weight less than -1\n", __func__);
return -ERANGE;
}
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
