MINOR: stick-tables: Add peers process binding computing.

Add a list of proxies for all the stick-tables (->proxies_list struct stktable
member) so that to be able to compute the process bindings of the peers after having
parsed the configuration file.
The proxies are added to the stick-tables they reference when parsing
stick-tables lines in proxy sections, when checking the actions in
check_trk_action() and when resolving samples args for stick-tables
without checking is they are duplicates. We check only there is no loop.
Then, after having parsed everything, we add the proxy bindings to the
peers frontend bindings with stick-tables they reference.

diff --git a/include/types/proxy.h b/include/types/proxy.h
index f6d2634f6e3d7c825eef9fe32449d48290e3919c..45ef2c824acd191f6eb211e1129b4392356ca4b1 100644 (file)
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -395,6 +395,7 @@ struct proxy {
        struct conn_src conn_src;               /* connection source settings */
        enum obj_type *default_target;          /* default target to use for accepted streams or NULL */
        struct proxy *next;
+       struct proxy *next_stkt_ref;    /* Link to the list of proxies which refer to the same stick-table. */
 
        struct list logsrvs;
        struct list logformat;                  /* log_format linked list */

diff --git a/include/types/stick_table.h b/include/types/stick_table.h
index ff9546cd503243e35d5923592b84b3602e9fbb07..a4baeb37eeb6ae057dc404081c65ed9d74605518 100644 (file)
--- a/include/types/stick_table.h
+++ b/include/types/stick_table.h
@@ -185,6 +185,7 @@ struct stktable {
                void *p;
        } data_arg[STKTABLE_DATA_TYPES]; /* optional argument of each data type */
        struct proxy *proxy;      /* The proxy this stick-table is attached to, if any.*/
+       struct proxy *proxies_list; /* The list of proxies which reference this stick-table. */
 };
 
 extern struct stktable_data_type stktable_data_types[STKTABLE_DATA_TYPES];

diff --git a/src/action.c b/src/action.c
index 4cce7a4181f4b84ebf542dcc6b31847a90b5acce..54542420cf5f10f0469cd719984d86ac14a7fa3c 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -56,6 +56,10 @@ int check_trk_action(struct act_rule *rule, struct proxy *px, char **err)
                return 0;
        }
        else {
+               if (target->proxies_list != px) {
+                       px->next_stkt_ref = target->proxies_list;
+                       target->proxies_list = px;
+               }
                free(rule->arg.trk_ctr.table.n);
                rule->arg.trk_ctr.table.t = target;
                /* Note: if we decide to enhance the track-sc syntax, we may be

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index 2b2785a553d6b04daf376a9dc11efd80594eab79..7537bc2eca40caa5f15e8bccfc946815244dc754 100644 (file)
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -1749,6 +1749,12 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
                stktable_store_name(curproxy->table);
                curproxy->table->next = stktables_list;
                stktables_list = curproxy->table;
+
+               /* Add this proxy to the list of proxies which refer to its stick-table. */
+               if (curproxy->table->proxies_list != curproxy) {
+                       curproxy->next_stkt_ref = curproxy->table->proxies_list;
+                       curproxy->table->proxies_list = curproxy;
+               }
        }
        else if (!strcmp(args[0], "stick")) {
                struct sticking_rule *rule;

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 3e326330fb9d27f1a7c39f325ff270122364366a..c7db11068e72b558a6b018b0e4c66bb34766939a 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -3861,6 +3861,19 @@ out_uri_auth_compat:
                if (curproxy->table && curproxy->table->peers.p)
                        curproxy->table->peers.p->peers_fe->bind_proc |= curproxy->bind_proc;
 
+       /* compute the required process bindings for the peers from <stktables_list>
+        * for all the stick-tables, the ones coming with "peers" sections included.
+        */
+       for (t = stktables_list; t; t = t->next) {
+               struct proxy *p;
+
+               for (p = t->proxies_list; p; p = p->next_stkt_ref) {
+                       if (t->peers.p && t->peers.p->peers_fe) {
+                               t->peers.p->peers_fe->bind_proc |= p->bind_proc;
+                       }
+               }
+       }
+
        if (cfg_peers) {
                struct peers *curpeers = cfg_peers, **last;
                struct peer *p, *pb;

diff --git a/src/sample.c b/src/sample.c
index aa20d35d1ecf62b82284d05654a0da3aedba3b2c..2a1ce8d5e324f7a38bd17df324453456ddf3b173 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -1278,6 +1278,11 @@ int smp_resolve_args(struct proxy *p)
                                break;
                        }
 
+                       if (t->proxies_list != p) {
+                               p->next_stkt_ref = t->proxies_list;
+                               t->proxies_list = p;
+                       }
+
                        free(arg->data.str.area);
                        arg->data.str.area = NULL;
                        arg->unresolved = 0;