MINOR: backend: use be_counters for health down accounting

This commit is the first one of a series which aims to align counters
usage between frontends/listeners on one side and backends/servers on
the other.

Remove <down_trans> field from proxy structure. Use instead the same
name field from be_counters structure, which is already used for
servers.

diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h
index f15c0ec13a530e9dda0b07c96fbbb3d9faa1e2e4..eaeb06c2fc0155337a416f724d0cdb6d70787ca9 100644 (file)
--- a/include/haproxy/proxy-t.h
+++ b/include/haproxy/proxy-t.h
@@ -365,7 +365,6 @@ struct proxy {
        int conn_retries;                       /* maximum number of connect retries */
        unsigned int retry_type;                /* Type of retry allowed */
        int redispatch_after;                   /* number of retries before redispatch */
-       unsigned down_trans;                    /* up-down transitions */
        unsigned down_time;                     /* total time the proxy was down */
        time_t last_change;                     /* last time, when the state was changed */
        int (*accept)(struct stream *s);       /* application layer's accept() */

diff --git a/src/backend.c b/src/backend.c
index aaee78686036aea697a149b333cbe70c8e839103..57b9ee34f14b740b97c7c274b717a93ece4bb4c4 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -2567,7 +2567,7 @@ void back_handle_st_rdy(struct stream *s)
 void set_backend_down(struct proxy *be)
 {
        be->last_change = ns_to_sec(now_ns);
-       _HA_ATOMIC_INC(&be->down_trans);
+       _HA_ATOMIC_INC(&be->be_counters.down_trans);
 
        if (!(global.mode & MODE_STARTING)) {
                ha_alert("%s '%s' has no server available!\n", proxy_type_str(be), be->id);

diff --git a/src/stats.c b/src/stats.c
index df87c45b1f62d6a9f998cff080bb699e60661b32..959dc3593cb07e918ab699b070920bb60379577f 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -1710,7 +1710,7 @@ int stats_fill_be_stats(struct proxy *px, int flags, struct field *stats, int le
                                metric = mkf_u32(0, px->srv_bck);
                                break;
                        case ST_F_CHKDOWN:
-                               metric = mkf_u64(FN_COUNTER, px->down_trans);
+                               metric = mkf_u64(FN_COUNTER, px->be_counters.down_trans);
                                break;
                        case ST_F_LASTCHG:
                                metric = mkf_u32(FN_AGE, ns_to_sec(now_ns) - px->last_change);