IPVS: Make "no destination available" message more consistent between schedulers
Subsystems (4)
Simon Horman
maintainerPATCH 1/1 IPVS: Make "no destination available" message more consistent between schedulers
Cc Joseph Mack <[email protected]>
Cc Siim Põder <[email protected]>
Acked-by Graeme Fowler <[email protected]>
Signed-off-by Simon Horman <[email protected]>
---
net/netfilter/ipvs/ip_vs_lblc.c | 2 +- net/netfilter/ipvs/ip_vs_lblcr.c | 2 +- net/netfilter/ipvs/ip_vs_lc.c | 14 +++++++++----- net/netfilter/ipvs/ip_vs_nq.c | 4 +++- net/netfilter/ipvs/ip_vs_rr.c | 1 + net/netfilter/ipvs/ip_vs_sed.c | 1 + net/netfilter/ipvs/ip_vs_sh.c | 1 + net/netfilter/ipvs/ip_vs_wlc.c | 1 + net/netfilter/ipvs/ip_vs_wrr.c | 8 ++++++-- 9 files changed, 24 insertions(+), 10 deletions(-)
net/netfilter/ipvs/ip_vs_lblc.c +1 -1
@@ -507,7 +507,7 @@ ip_vs_lblc_schedule(struct ip_vs_service/* No cache entry or it is invalid, time to schedule */ dest =__ip_vs_lblc_schedule (svc);if (!dest) { -IP_VS_DBG (1 ,"no destination available\n" ); +IP_VS_ERR_RL ("LBLC: no destination available\n" );return NULL ; }
net/netfilter/ipvs/ip_vs_lblcr.c +1 -1
@@ -690,7 +690,7 @@ ip_vs_lblcr_schedule(struct ip_vs_servic/* The cache entry is invalid, time to schedule */ dest =__ip_vs_lblcr_schedule (svc);if (!dest) { -IP_VS_DBG (1 ,"no destination available\n" ); +IP_VS_ERR_RL ("LBLCR: no destination available\n" );read_unlock (&svc->sched_lock);return NULL ; }
net/netfilter/ipvs/ip_vs_lc.c +9 -5
@@ -66,11 +66,15 @@ ip_vs_lc_schedule(struct ip_vs_service * } } -if (least) -IP_VS_DBG_BUF (6 ,"LC: server %s:%u activeconns %d inactconns %d\n" , -IP_VS_DBG_ADDR (svc->af, &least->addr),ntohs (least->port), -atomic_read (&least->activeconns), -atomic_read (&least->inactconns)); +if (!least) +IP_VS_ERR_RL ("LC: no destination available\n" ); +else +IP_VS_DBG_BUF (6 ,"LC: server %s:%u activeconns %d " +"inactconns %d\n" , +IP_VS_DBG_ADDR (svc->af, &least->addr), +ntohs (least->port), +atomic_read (&least->activeconns), +atomic_read (&least->inactconns));return least; }
net/netfilter/ipvs/ip_vs_nq.c +3 -1
@@ -95,8 +95,10 @@ ip_vs_nq_schedule(struct ip_vs_service * } } -if (!least) +if (!least) { +IP_VS_ERR_RL ("NQ: no destination available\n" );return NULL ; + } out: IP_VS_DBG_BUF(6, "NQ: server %s:%u "
net/netfilter/ipvs/ip_vs_rr.c +1 -0
@@ -69,6 +69,7 @@ ip_vs_rr_schedule(struct ip_vs_service * q = q->next; }while (q != p);write_unlock (&svc->sched_lock); +IP_VS_ERR_RL ("RR: no destination available\n" );return NULL ; out:
net/netfilter/ipvs/ip_vs_sed.c +1 -0
@@ -84,6 +84,7 @@ ip_vs_sed_schedule(struct ip_vs_service goto nextstage; } } +IP_VS_ERR_RL ("SED: no destination available\n" );return NULL ;/*
net/netfilter/ipvs/ip_vs_sh.c +1 -0
@@ -219,6 +219,7 @@ ip_vs_sh_schedule(struct ip_vs_service * || !(dest->flags & IP_VS_DEST_F_AVAILABLE) || atomic_read(&dest->weight) <= 0 || is_overloaded(dest)) { +IP_VS_ERR_RL ("SH: no destination available\n" );return NULL ; }
net/netfilter/ipvs/ip_vs_wlc.c +1 -0
@@ -72,6 +72,7 @@ ip_vs_wlc_schedule(struct ip_vs_service goto nextstage; } } +IP_VS_ERR_RL ("WLC: no destination available\n" );return NULL ;/*
net/netfilter/ipvs/ip_vs_wrr.c +6 -2
@@ -155,6 +155,8 @@ ip_vs_wrr_schedule(struct ip_vs_serviceif (mark->cl == mark->cl->next) {/* no dest entry */ +IP_VS_ERR_RL ("WRR: no destination available: " +"no destinations present\n" ); dest =NULL ; goto out; }
@@ -168,8 +170,8 @@ ip_vs_wrr_schedule(struct ip_vs_service*/ if (mark->cw ==0 ) { mark->cl = &svc->destinations; -IP_VS_ERR_RL ("ip_vs_wrr_schedule(): " -"no available servers\n" ); +IP_VS_ERR_RL ("WRR: no destination " +"available\n" ); dest =NULL ; goto out; }
@@ -191,6 +193,8 @@ ip_vs_wrr_schedule(struct ip_vs_service/* back to the start, and no dest is found. It is only possible when all dests are OVERLOADED */ dest =NULL ; +IP_VS_ERR_RL ("WRR: no destination available: " +"all destinations are overloaded\n" ); goto out; } }
From: Simon Horman <[email protected]>
Date: Tue, 30 Dec 2008 11:46:44 +1100
Quoted 2 lines
Acked-by Graeme Fowler <[email protected]>Signed-off-by Simon Horman <[email protected]>
Applied, thanks a lot Simon.