ipvs: improved SH fallback strategy
Subsystems (4)
PATCH 1/1 ipvs: improved SH fallback strategy
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.
---
net/netfilter/ipvs/ip_vs_sh.c +26 -13
@@ -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); + +if (!dest) +return NULL ; + +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), -ntohs (dest->port), offset); -else -return dest; +ntohs (dest->port), roffset); +else +return dest; + } + }else { +return dest; }return NULL ;
Hello.
Quoted 23 lines · Alexander Frolkin
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 <[email protected]>---
net/netfilter/ipvs/ip_vs_sh.c +2
-3@@ -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++) {
net/netfilter/ipvs/ip_vs_sh.c static inline struct ip_vs_dest * · line 129
Quoted 10 lines
net/netfilter/ipvs/ip_vs_sh.c +3
-7- 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).
net/netfilter/ipvs/ip_vs_sh.c static inline struct ip_vs_dest * · line 132
Quoted 3 lines
net/netfilter/ipvs/ip_vs_sh.c +3
-0+if (!dest) +return NULL ; +
Here too.
net/netfilter/ipvs/ip_vs_sh.c static inline struct ip_vs_dest * · line 145
Quoted 13 lines
net/netfilter/ipvs/ip_vs_sh.c +12
-0+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
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.
--
net/netfilter/ipvs/ip_vs_sh.c +24 -13
@@ -120,22 +120,33 @@ 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); +if (!dest) +return NULL ; +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), -ntohs (dest->port), offset); -else -return dest; +ntohs (dest->port), roffset); +else +return dest; + } + }else { +return dest; }return NULL ;
Simon Horman
maintainerQuoted 7 lines · Alexander Frolkin
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 <[email protected]>
Hi Alexander,
could you add some comments to the code or at least a description of the algorithm to the above the function. The intent of original code may not have been obvious to the eye but this version certainly isn't obvious to mine.
Quoted 58 lines
--
net/netfilter/ipvs/ip_vs_sh.c +24
-14@@ -120,22 +120,33 @@ 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); +if (!dest) +return NULL ; +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), -ntohs (dest->port), offset); -else -return dest; +ntohs (dest->port), roffset); +else +return dest; + } + }else { +return dest; }return NULL ; --To unsubscribe from this list: send the line "unsubscribe lvs-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
Quoted 4 lines
could you add some comments to the code or at least a description of the algorithm to the above the function. The intent of original code may not have been obvious to the eye but this version certainly isn't obvious to mine.
Sure. I have a bad habit of assuming that if I understand something, then others automatically do too. :-)
The original code went through the table, starting at the same place as the code without fallback and if that returned an unavailable realserver, it offset the hash by one and repeated the lookup, then added two, etc., up to IP_VS_SH_TAB_SIZE-1. So the hash offset was 0, 1, ..., IP_VS_SH_TAB_SIZE-1.
The result is that if a server is down, all traffic destined for it would fall back onto the next server in the list.
The new code also starts at the same place as the old code (offset 0), but if that fails, it uses the same fallback strategy as the old code, but the hash offset is now ihash, ihash + 1, ..., IP_VS_SH_TAB_SIZE-1, 0, 1, ..., ihash - 1, i.e., it starts at ihash instead of 0 and loops around the table. ihash could have been a random number, but choosing it to be something based on the source IP and port (in which case it may as well be the same hash [offset 0]) means that the behaviour will be the same on different directors.
This spreads the load of an unavailable server across the remaining servers instead of just moving it to the next one in the list.
Hope that makes sense...
I'll submit a patch with a comment shortly.
Alex
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.
--
net/netfilter/ipvs/ip_vs_sh.c +34 -14
@@ -115,27 +115,47 @@ ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, } -/* As ip_vs_sh_get, but with fallback if selected server is unavailable */ +/* As ip_vs_sh_get, but with fallback if selected server is unavailable +* +* The fallback strategy loops around the table starting from a "random" +* point (in fact, it is chosen to be the original hash value to make the +* algorithm deterministic) to find a new server. +*/ 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)" , +/* first try the dest it's supposed to go to */ + ihash =ip_vs_sh_hashkey (svc->af, addr, port,0 ); + dest =rcu_dereference (s->buckets[ihash].dest); +if (!dest) +return NULL ; +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)); +/* if the original dest is unavailable, loop around the table +* starting from ihash to find a new dest +*/ +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), -ntohs (dest->port), offset); -else -return dest; +ntohs (dest->port), roffset); +else +return dest; + } + }else { +return dest; }return NULL ;
Julian Anastasov
maintainerHello,
Quoted 37 lines · Alexander Frolkin
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 <[email protected]>--
net/netfilter/ipvs/ip_vs_sh.c +8
-6@@ -115,27 +115,47 @@ ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, } -/* As ip_vs_sh_get, but with fallback if selected server is unavailable */ +/* As ip_vs_sh_get, but with fallback if selected server is unavailable +* +* The fallback strategy loops around the table starting from a "random" +* point (in fact, it is chosen to be the original hash value to make the +* algorithm deterministic) to find a new server. +*/ 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);
net/netfilter/ipvs/ip_vs_sh.c ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, · line 136
Quoted 10 lines
net/netfilter/ipvs/ip_vs_sh.c +5
-5-if (!dest) -break ; -if (is_unavailable (dest)) - IP_VS_DBG_BUF(6, "SH: selected unavailable server " - "%s:%d (offset %d)", +/* first try the dest it's supposed to go to */ + ihash =ip_vs_sh_hashkey (svc->af, addr, port,0 ); + dest =rcu_dereference (s->buckets[ihash].dest); +if (!dest) +return NULL ;
Can we reduce the indentation here, eg: if (!is_unavailable(dest)) return dest; IP_VS_DBG_BUF(6, "SH: selected unavailable server " ... for ()... ... return NULL;
net/netfilter/ipvs/ip_vs_sh.c ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, · line 148
Quoted 12 lines
net/netfilter/ipvs/ip_vs_sh.c +12
-0+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)); +/* if the original dest is unavailable, loop around the table +* starting from ihash to find a new dest +*/ +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);
Every result of rcu_dereference should be checked
for NULL (no dests anymore):
if (!dest) break; Then make sure there is correct indentation
for IP_VS_DBG_BUF parameters.
Quoted 6 lines
net/netfilter/ipvs/ip_vs_sh.c +3
-2+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), - ntohs(dest->port), offset); - else
net/netfilter/ipvs/ip_vs_sh.c ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, · line 161
Quoted 10 lines
net/netfilter/ipvs/ip_vs_sh.c +6
-1-return dest; + ntohs(dest->port), roffset); + else + return dest; + } + }else { +return dest; }return NULL ;
Regards
--
Julian Anastasov <[email protected]>
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.
--
net/netfilter/ipvs/ip_vs_sh.c +32 -10
@@ -115,27 +115,49 @@ ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, } -/* As ip_vs_sh_get, but with fallback if selected server is unavailable */ +/* As ip_vs_sh_get, but with fallback if selected server is unavailable +* +* The fallback strategy loops around the table starting from a "random" +* point (in fact, it is chosen to be the original hash value to make the +* algorithm deterministic) to find a new server. +*/ 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; +/* first try the dest it's supposed to go to */ + ihash =ip_vs_sh_hashkey (svc->af, addr, port,0 ); + dest =rcu_dereference (s->buckets[ihash].dest); +if (!dest) +return NULL ; +if (!is_unavailable (dest)) +return dest; + +IP_VS_DBG_BUF (6 ,"SH: selected unavailable server " +"%s:%d, reselecting" , +IP_VS_DBG_ADDR (svc->af, &dest->addr), +ntohs (dest->port)); + +/* if the original dest is unavailable, loop around the table +* starting from ihash to find a new dest +*/ for (offset =0 ; offset <IP_VS_SH_TAB_SIZE ; offset++) { - hash =ip_vs_sh_hashkey (svc->af, addr, port, 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 (!dest)break ; -if (is_unavailable (dest)) -IP_VS_DBG_BUF (6 ,"SH: selected unavailable server " -"%s:%d (offset %d)" , -IP_VS_DBG_ADDR (svc->af, &dest->addr), -ntohs (dest->port), offset); -else +if (!is_unavailable (dest))return dest; +IP_VS_DBG_BUF (6 ,"SH: selected unavailable " +"server %s:%d (offset %d), reselecting" , +IP_VS_DBG_ADDR (svc->af, &dest->addr), +ntohs (dest->port), + roffset); }return NULL ;
Julian Anastasov
maintainerHello,
Quoted 7 lines · Alexander Frolkin
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 <[email protected]>
Looks correct to me, just fix the below indentations.
Also, please use version number for your patches, eg. [PATCHv2] ipvs: ...
net/netfilter/ipvs/ip_vs_sh.c ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, · line 143
Quoted 9 lines
net/netfilter/ipvs/ip_vs_sh.c +4
-0+IP_VS_DBG_BUF (6 ,"SH: selected unavailable server " +"%s:%d, reselecting" , +IP_VS_DBG_ADDR (svc->af, &dest->addr), +ntohs (dest->port));
Indentation: IP_VS_DBG_BUF(6, "SH: selected unavailable server %s:%d, reselecting", IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port));
net/netfilter/ipvs/ip_vs_sh.c ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, · line 160
Quoted 5 lines
net/netfilter/ipvs/ip_vs_sh.c +5
-0+IP_VS_DBG_BUF (6 ,"SH: selected unavailable " +"server %s:%d (offset %d), reselecting" , +IP_VS_DBG_ADDR (svc->af, &dest->addr), +ntohs (dest->port), + roffset);
Indentation: IP_VS_DBG_BUF(6, "SH: selected unavailable " "server %s:%d (offset %d), reselecting", IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port), roffset);
Regards
--
Julian Anastasov <[email protected]>
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.
--
net/netfilter/ipvs/ip_vs_sh.c +29 -10
@@ -115,27 +115,46 @@ ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, } -/* As ip_vs_sh_get, but with fallback if selected server is unavailable */ +/* As ip_vs_sh_get, but with fallback if selected server is unavailable +* +* The fallback strategy loops around the table starting from a "random" +* point (in fact, it is chosen to be the original hash value to make the +* algorithm deterministic) to find a new server. +*/ 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; +/* first try the dest it's supposed to go to */ + ihash =ip_vs_sh_hashkey (svc->af, addr, port,0 ); + dest =rcu_dereference (s->buckets[ihash].dest); +if (!dest) +return NULL ; +if (!is_unavailable (dest)) +return dest; + +IP_VS_DBG_BUF (6 ,"SH: selected unavailable server %s:%d, reselecting" , +IP_VS_DBG_ADDR (svc->af, &dest->addr),ntohs (dest->port)); + +/* if the original dest is unavailable, loop around the table +* starting from ihash to find a new dest +*/ for (offset =0 ; offset <IP_VS_SH_TAB_SIZE ; offset++) { - hash =ip_vs_sh_hashkey (svc->af, addr, port, 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 (!dest)break ; -if (is_unavailable (dest)) -IP_VS_DBG_BUF (6 ,"SH: selected unavailable server " -"%s:%d (offset %d)" , -IP_VS_DBG_ADDR (svc->af, &dest->addr), -ntohs (dest->port), offset); -else +if (!is_unavailable (dest))return dest; +IP_VS_DBG_BUF (6 ,"SH: selected unavailable " +"server %s:%d (offset %d), reselecting" , +IP_VS_DBG_ADDR (svc->af, &dest->addr), +ntohs (dest->port), roffset); }return NULL ;
Hello,
Quoted 7 lines · Alexander Frolkin
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 <[email protected]>
Thanks! Looks good to me.
Quoted 52 lines
--
net/netfilter/ipvs/ip_vs_sh.c +24
-9@@ -115,27 +115,46 @@ ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, } -/* As ip_vs_sh_get, but with fallback if selected server is unavailable */ +/* As ip_vs_sh_get, but with fallback if selected server is unavailable +* +* The fallback strategy loops around the table starting from a "random" +* point (in fact, it is chosen to be the original hash value to make the +* algorithm deterministic) to find a new server. +*/ 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; +/* first try the dest it's supposed to go to */ + ihash =ip_vs_sh_hashkey (svc->af, addr, port,0 ); + dest =rcu_dereference (s->buckets[ihash].dest); +if (!dest) +return NULL ; +if (!is_unavailable (dest)) +return dest; + +IP_VS_DBG_BUF (6 ,"SH: selected unavailable server %s:%d, reselecting" , +IP_VS_DBG_ADDR (svc->af, &dest->addr),ntohs (dest->port)); + +/* if the original dest is unavailable, loop around the table +* starting from ihash to find a new dest +*/ for (offset =0 ; offset <IP_VS_SH_TAB_SIZE ; offset++) { - hash =ip_vs_sh_hashkey (svc->af, addr, port, 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 (!dest)break ; -if (is_unavailable (dest)) -IP_VS_DBG_BUF (6 ,"SH: selected unavailable server " -"%s:%d (offset %d)" , -IP_VS_DBG_ADDR (svc->af, &dest->addr), -ntohs (dest->port), offset);
net/netfilter/ipvs/ip_vs_sh.c ip_vs_sh_get(struct ip_vs_service *svc, struct ip_vs_sh_state *s, · line 160
Quoted 10 lines
net/netfilter/ipvs/ip_vs_sh.c +5
-1-else +if (!is_unavailable (dest))return dest; +IP_VS_DBG_BUF (6 ,"SH: selected unavailable " +"server %s:%d (offset %d), reselecting" , +IP_VS_DBG_ADDR (svc->af, &dest->addr), +ntohs (dest->port), roffset); }return NULL ;
Regards
--
Julian Anastasov <[email protected]>
Simon Horman
maintainerQuoted 11 lines · Julian Anastasov
Hello,
Quoted 6 lines · Alexander Frolkin
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.
Quoted 5 lines
Quoted 1 line
Signed-off-by Alexander Frolkin <[email protected]>Thanks! Looks good to me.
Acked-by Julian Anastasov <[email protected]>
Sorry for letting this one slip.
I have queued it up.