From e4fa845c19b7cb51dbf6df5a5f893bd516522432 Mon Sep 17 00:00:00 2001 From: Bhaskar Maddala Date: Mon, 3 Feb 2014 16:26:46 -0500 Subject: [PATCH] Enhancement to stats page to provide information of last session time. Summary: Track and report last session time on the stats page for each server in every backend, as well as the backend. This attempts to address the requirement in the ROADMAP - add a last activity date for each server (req/resp) that will be displayed in the stats. It will be useful with soft stop. The stats page reports this as time elapsed since last activity/session. --- include/proto/backend.h | 9 +++++++++ include/proto/server.h | 10 ++++++++++ include/types/counters.h | 2 ++ src/backend.c | 11 +++++++++++ src/dumpstats.c | 36 ++++++++++++++++++++---------------- src/proto_http.c | 1 + src/server.c | 8 ++++++++ src/session.c | 4 ++++ 8 files changed, 65 insertions(+), 16 deletions(-) diff --git a/include/proto/backend.h b/include/proto/backend.h index 74caaaa..36a4bc0 100644 --- a/include/proto/backend.h +++ b/include/proto/backend.h @@ -23,6 +23,7 @@ #define _PROTO_BACKEND_H #include +#include #include #include @@ -43,6 +44,14 @@ void recount_servers(struct proxy *px); void update_backend_weight(struct proxy *px); struct server *get_server_sh(struct proxy *px, const char *addr, int len); struct server *get_server_uh(struct proxy *px, char *uri, int uri_len); +int be_lastsession(const struct proxy *be); + +/* set the time of last session on the backend */ +static void inline be_set_sess_last(struct proxy *be) +{ + tv_zero(&be->be_counters.last_sess); + tv_now(&be->be_counters.last_sess); +} /* This function returns non-zero if a server with the given weight and state * is usable for LB, otherwise zero. diff --git a/include/proto/server.h b/include/proto/server.h index 93f4f81..dc37e73 100644 --- a/include/proto/server.h +++ b/include/proto/server.h @@ -25,14 +25,17 @@ #include #include +#include #include #include #include #include +#include #include int srv_downtime(const struct server *s); +int srv_lastsession(const struct server *s); int srv_getinter(const struct check *check); /* increase the number of cumulated connections on the designated server */ @@ -44,6 +47,13 @@ static void inline srv_inc_sess_ctr(struct server *s) s->counters.sps_max = s->sess_per_sec.curr_ctr; } +/* set the time of last session on the designated server */ +static void inline srv_set_sess_last(struct server *s) +{ + tv_zero(&s->counters.last_sess); + tv_now(&s->counters.last_sess); +} + #endif /* _PROTO_SERVER_H */ /* diff --git a/include/types/counters.h b/include/types/counters.h index efb48f6..90c25a7 100644 --- a/include/types/counters.h +++ b/include/types/counters.h @@ -29,6 +29,7 @@ struct pxcounters { long long cum_conn; /* cumulated number of received connections */ long long cum_sess; /* cumulated number of accepted connections */ long long cum_lbconn; /* cumulated number of sessions processed by load balancing (BE only) */ + struct timeval last_sess; /* last session time */ unsigned int cps_max; /* maximum of new connections received per second */ unsigned int sps_max; /* maximum of new connections accepted per second (sessions) */ @@ -85,6 +86,7 @@ struct srvcounters { long long cum_sess; /* cumulated number of sessions really sent to this server */ long long cum_lbconn; /* cumulated number of sessions directed by load balancing */ + struct timeval last_sess; /* last session time */ long long bytes_in; /* number of bytes transferred from the client to the server */ long long bytes_out; /* number of bytes transferred from the server to the client */ diff --git a/src/backend.c b/src/backend.c index 8fcce7d..d0a6f0a 100644 --- a/src/backend.c +++ b/src/backend.c @@ -52,6 +52,14 @@ #include #include +int be_lastsession(const struct proxy *be) +{ + if(be->be_counters.last_sess.tv_sec) + return now.tv_sec - be->be_counters.last_sess.tv_sec; + + return -1; +} + /* helper function to invoke the correct hash method */ static unsigned long gen_hash(const struct proxy* px, const char* key, unsigned long len) { @@ -668,6 +676,7 @@ int assign_server(struct session *s) goto out; } else if (srv != prev_srv) { + be_set_sess_last(s->be); s->be->be_counters.cum_lbconn++; srv->counters.cum_lbconn++; } @@ -1165,6 +1174,8 @@ int srv_redispatch_connect(struct session *t) if (srv) srv_inc_sess_ctr(srv); if (srv) + srv_set_sess_last(srv); + if (srv) srv->counters.failed_conns++; t->be->be_counters.failed_conns++; diff --git a/src/dumpstats.c b/src/dumpstats.c index 2599785..32b0902 100644 --- a/src/dumpstats.c +++ b/src/dumpstats.c @@ -433,7 +433,7 @@ static void stats_dump_csv_header() chunk_appendf(&trash, "# pxname,svname," "qcur,qmax," - "scur,smax,slim,stot," + "scur,smax,slim,stot,lastsess," "bin,bout," "dreq,dresp," "ereq,econ,eresp," @@ -2467,8 +2467,8 @@ static int stats_dump_fe_stats(struct stream_interface *si, struct proxy *px) chunk_appendf(&trash, "" - /* sessions: lbtot */ - "" + /* sessions: lbtot, lastsess */ + "" /* bytes : in */ "%s" "", @@ -2505,8 +2505,8 @@ static int stats_dump_fe_stats(struct stream_interface *si, struct proxy *px) chunk_appendf(&trash, /* pxid, name, queue cur, queue max, */ "%s,FRONTEND,,," - /* sessions : current, max, limit, total */ - "%d,%d,%d,%lld," + /* sessions : current, max, limit, total, lastsess */ + "%d,%d,%d,%lld,," /* bytes : in, out */ "%lld,%lld," /* denied: req, resp */ @@ -2829,9 +2829,10 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in chunk_appendf(&trash, "" - /* sessions: lbtot */ - "%s", - U2H(sv->counters.cum_lbconn)); + /* sessions: lbtot, last */ + "%s%s", + U2H(sv->counters.cum_lbconn), + human_time(srv_lastsession(sv), 1)); chunk_appendf(&trash, /* bytes : in, out */ @@ -2957,8 +2958,8 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in "%s,%s," /* queue : current, max */ "%d,%d," - /* sessions : current, max, limit, total */ - "%d,%d,%s,%lld," + /* sessions : current, max, limit, total, lastsess */ + "%d,%d,%s,%lld,%s," /* bytes : in, out */ "%lld,%lld," /* denied: req, resp */ @@ -2971,6 +2972,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in px->id, sv->id, sv->nbpend, sv->counters.nbpend_max, sv->cur_sess, sv->counters.cur_sess_max, LIM2A(sv->maxconn, ""), sv->counters.cum_sess, + human_time(srv_lastsession(sv), 1), sv->counters.bytes_in, sv->counters.bytes_out, sv->counters.failed_secu, sv->counters.failed_conns, sv->counters.failed_resp, @@ -3177,12 +3179,13 @@ static int stats_dump_be_stats(struct stream_interface *si, struct proxy *px, in chunk_appendf(&trash, "" - /* sessions: lbtot */ - "%s" + /* sessions: lbtot, last */ + "%s%s" /* bytes: in */ "%s" "", U2H(px->be_counters.cum_lbconn), + human_time(be_lastsession(px), 1), U2H(px->be_counters.bytes_in)); chunk_appendf(&trash, @@ -3238,8 +3241,8 @@ static int stats_dump_be_stats(struct stream_interface *si, struct proxy *px, in "%s,BACKEND," /* queue : current, max */ "%d,%d," - /* sessions : current, max, limit, total */ - "%d,%d,%d,%lld," + /* sessions : current, max, limit, total, lastsess */ + "%d,%d,%d,%lld,%s," /* bytes : in, out */ "%lld,%lld," /* denied: req, resp */ @@ -3265,6 +3268,7 @@ static int stats_dump_be_stats(struct stream_interface *si, struct proxy *px, in px->id, px->nbpend /* or px->totpend ? */, px->be_counters.nbpend_max, px->beconn, px->be_counters.conn_max, px->fullconn, px->be_counters.cum_conn, + human_time(be_lastsession(px), 1), px->be_counters.bytes_in, px->be_counters.bytes_out, px->be_counters.denied_req, px->be_counters.denied_resp, px->be_counters.failed_conns, px->be_counters.failed_resp, @@ -3378,7 +3382,7 @@ static void stats_dump_html_px_hdr(struct stream_interface *si, struct proxy *px chunk_appendf(&trash, "" "Queue" - "Session rateSessions" + "Session rateSessions" "BytesDenied" "ErrorsWarnings" "Server" @@ -3386,7 +3390,7 @@ static void stats_dump_html_px_hdr(struct stream_interface *si, struct proxy *px "" "CurMaxLimit" "CurMaxLimitCurMax" - "LimitTotalLbTotInOut" + "LimitTotalLbTotLastInOut" "ReqRespReqConn" "RespRetrRedis" "StatusLastChkWghtAct" diff --git a/src/proto_http.c b/src/proto_http.c index e92dc6a..7fc2506 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -903,6 +903,7 @@ void http_perform_server_redirect(struct session *s, struct stream_interface *si /* FIXME: we should increase a counter of redirects per server and per backend. */ srv_inc_sess_ctr(srv); + srv_set_sess_last(srv); } /* Return the error message corresponding to si->err_type. It is assumed diff --git a/src/server.c b/src/server.c index d91c726..07fb488 100644 --- a/src/server.c +++ b/src/server.c @@ -30,6 +30,14 @@ int srv_downtime(const struct server *s) return now.tv_sec - s->last_change + s->down_time; } +int srv_lastsession(const struct server *s) +{ + if(s->counters.last_sess.tv_sec) + return now.tv_sec - s->counters.last_sess.tv_sec; + + return -1; +} + int srv_getinter(const struct check *check) { const struct server *s = check->server; diff --git a/src/session.c b/src/session.c index aae0c69..4768fd3 100644 --- a/src/session.c +++ b/src/session.c @@ -975,6 +975,8 @@ static void sess_update_stream_int(struct session *s, struct stream_interface *s /* state = SI_ST_CON or SI_ST_EST now */ if (srv) srv_inc_sess_ctr(srv); + if (srv) + srv_set_sess_last(srv); return; } @@ -989,6 +991,8 @@ static void sess_update_stream_int(struct session *s, struct stream_interface *s if (srv) srv_inc_sess_ctr(srv); if (srv) + srv_set_sess_last(srv); + if (srv) srv->counters.failed_conns++; s->be->be_counters.failed_conns++; -- 1.8.3.4 (Apple Git-47)