From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Alexander Frolkin <avf@eldamar.org.uk>
Cc: Julian Anastasov <ja@ssi.bg>,
lvs-devel@vger.kernel.org, Wensong Zhang <wensong@linux-vs.org>,
Simon Horman <horms@verge.net.au>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ipvs: improved SH fallback strategy
Date: Mon, 23 Sep 2013 23:42:50 +0400 [thread overview]
Message-ID: <524099BA.5020303@cogentembedded.com> (raw)
In-Reply-To: <20130923115139.GA15034@eldamar.org.uk>
Hello.
On 09/23/2013 03:51 PM, Alexander Frolkin wrote:
> Improve the SH fallback realserver selection strategy.
> With sh and sh-fallback, if a realserver is down, this attempts to
> distribute the traffic that would have gone to that server evenly
> among the remaining servers.
> Signed-off-by: Alexander Frolkin <avf@eldamar.org.uk>
> ---
> diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
> index f16c027..1676354 100644
> --- a/net/netfilter/ipvs/ip_vs_sh.c
> +++ b/net/netfilter/ipvs/ip_vs_sh.c
> @@ -120,22 +120,35 @@ static inline struct ip_vs_dest *
> ip_vs_sh_get_fallback(struct ip_vs_service *svc, struct ip_vs_sh_state *s,
> const union nf_inet_addr *addr, __be16 port)
> {
> - unsigned int offset;
> - unsigned int hash;
> + unsigned int offset, roffset;
> + unsigned int hash, ihash;
> struct ip_vs_dest *dest;
>
> - for (offset = 0; offset < IP_VS_SH_TAB_SIZE; offset++) {
> - hash = ip_vs_sh_hashkey(svc->af, addr, port, offset);
> - dest = rcu_dereference(s->buckets[hash].dest);
> - if (!dest)
> - break;
> - if (is_unavailable(dest))
> - IP_VS_DBG_BUF(6, "SH: selected unavailable server "
> - "%s:%d (offset %d)",
> + ihash = ip_vs_sh_hashkey(svc->af, addr, port, 0);
> + dest = rcu_dereference(s->buckets[ihash].dest);
> +
Empty line net needed here (and it wasn't there in the original code).
> + if (!dest)
> + return NULL;
> +
Here too.
> + if (is_unavailable(dest)) {
> + IP_VS_DBG_BUF(6, "SH: selected unavailable server "
> + "%s:%d, reselecting",
> + IP_VS_DBG_ADDR(svc->af, &dest->addr),
> + ntohs(dest->port));
> + for (offset = 0; offset < IP_VS_SH_TAB_SIZE; offset++) {
> + roffset = (offset + ihash) % IP_VS_SH_TAB_SIZE;
> + hash = ip_vs_sh_hashkey(svc->af, addr, port, roffset);
> + dest = rcu_dereference(s->buckets[hash].dest);
> + if (is_unavailable(dest))
> + IP_VS_DBG_BUF(6, "SH: selected unavailable "
> + "server %s:%d (offset %d), reselecting",
> IP_VS_DBG_ADDR(svc->af, &dest->addr),
WBR, Sergei
next prev parent reply other threads:[~2013-09-23 19:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-23 11:51 [PATCH] ipvs: improved SH fallback strategy Alexander Frolkin
2013-09-23 19:42 ` Sergei Shtylyov [this message]
2013-09-24 9:32 ` Alexander Frolkin
2013-09-25 0:30 ` Simon Horman
2013-09-25 9:01 ` Alexander Frolkin
2013-09-25 9:26 ` Alexander Frolkin
2013-09-26 5:30 ` Julian Anastasov
2013-09-26 10:05 ` Alexander Frolkin
2013-09-26 20:05 ` Julian Anastasov
2013-09-27 10:06 ` [PATCHv2] " Alexander Frolkin
2013-09-27 19:20 ` Julian Anastasov
2013-10-15 1:55 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=524099BA.5020303@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=avf@eldamar.org.uk \
--cc=horms@verge.net.au \
--cc=ja@ssi.bg \
--cc=linux-kernel@vger.kernel.org \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=wensong@linux-vs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).