From: Willy Tarreau Date: Mon, 25 Jul 2011 06:16:20 +0000 (+0200) Subject: [MINOR] stats: report a "WAITING" state for sockets waiting for resource X-Git-Tag: v1.5-dev8~171 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a17c2d93617012f6e7db98fcdfadd434a96ed847;p=thirdparty%2Fhaproxy.git [MINOR] stats: report a "WAITING" state for sockets waiting for resource This is useful when enabling socket-stats to know that a socket is being waiting for some resource (RAM, global connections, etc...). --- diff --git a/doc/configuration.txt b/doc/configuration.txt index 4811043b8e..2eafd7fb53 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -4161,8 +4161,9 @@ rate-limit sessions rate-limit sessions 10 server 127.0.0.1:1025 - Note : when the maximum rate is reached, the frontend's status appears as - "FULL" in the statistics, exactly as when it is saturated. + Note : when the maximum rate is reached, the frontend's status is not changed + but its sockets appear as "WAITING" in the statistics if the + "socket-stats" option is enabled. See also : the "backlog" keyword and the "fe_sess_rate" ACL criterion. diff --git a/src/dumpstats.c b/src/dumpstats.c index 3ef2278c1a..96999852c8 100644 --- a/src/dumpstats.c +++ b/src/dumpstats.c @@ -2213,7 +2213,7 @@ static int stats_dump_proxy(struct stream_interface *si, struct proxy *px, struc "", U2H0(l->counters->denied_req), U2H1(l->counters->denied_resp), U2H2(l->counters->failed_req), - (l->nbconn < l->maxconn) ? "OPEN" : "FULL"); + (l->nbconn < l->maxconn) ? (l->state == LI_LIMITED) ? "WAITING" : "OPEN" : "FULL"); } else { chunk_printf(&msg, /* pxid, name, queue cur, queue max, */