mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: proxy/stktable: add resolve_stick_rule helper function

Browse Source 
Simplify stick and store sticktable proxy rules postparsing by adding
a sticking rule entry resolve (postparsing) function.

This will ease code maintenance.
This commit is contained in:
Aurelien DARRAGON 2023-08-08 11:37:59 +02:00 committed by Willy Tarreau
parent d82a6d93e2
commit b9c0b039c8
3 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/proxy.h
View File

@ -84,6 +84,7 @@ void proxy_capture_error(struct proxy *proxy, int is_back,
void proxy_adjust_all_maxconn(void); void proxy_adjust_all_maxconn(void);
struct proxy *cli_find_frontend(struct appctx *appctx, const char *arg); struct proxy *cli_find_frontend(struct appctx *appctx, const char *arg);
struct proxy *cli_find_frontend(struct appctx *appctx, const char *arg); struct proxy *cli_find_frontend(struct appctx *appctx, const char *arg);
int resolve_stick_rule(struct proxy *curproxy, struct sticking_rule *mrule);
/* /*
* This function returns a string containing the type of the proxy in a format * This function returns a string containing the type of the proxy in a format

55
src/cfgparse.c
View File

@ -3243,71 +3243,22 @@ int check_config_validity()
/* find the target table for 'stick' rules */ /* find the target table for 'stick' rules */
list_for_each_entry(mrule, &curproxy->sticking_rules, list) { list_for_each_entry(mrule, &curproxy->sticking_rules, list) {
struct stktable *target;
curproxy->be_req_ana |= AN_REQ_STICKING_RULES; curproxy->be_req_ana |= AN_REQ_STICKING_RULES;
if (mrule->flags & STK_IS_STORE) if (mrule->flags & STK_IS_STORE)
curproxy->be_rsp_ana |= AN_RES_STORE_RULES; curproxy->be_rsp_ana |= AN_RES_STORE_RULES;
if (mrule->table.name) if (!resolve_stick_rule(curproxy, mrule))
target = stktable_find_by_name(mrule->table.name); cfgerr++;
else
target = curproxy->table;
if (!target) {
ha_alert("Proxy '%s': unable to find stick-table '%s'.\n",
curproxy->id, mrule->table.name ? mrule->table.name : curproxy->id);
cfgerr++;
}
else if (!stktable_compatible_sample(mrule->expr, target->type)) {
ha_alert("Proxy '%s': type of fetch not usable with type of stick-table '%s'.\n",
curproxy->id, mrule->table.name ? mrule->table.name : curproxy->id);
cfgerr++;
}
else {
ha_free(&mrule->table.name);
mrule->table.t = target;
stktable_alloc_data_type(target, STKTABLE_DT_SERVER_ID, NULL, NULL);
stktable_alloc_data_type(target, STKTABLE_DT_SERVER_KEY, NULL, NULL);
if (!in_proxies_list(target->proxies_list, curproxy)) {
curproxy->next_stkt_ref = target->proxies_list;
target->proxies_list = curproxy;
}
}
err_code |= warnif_tcp_http_cond(curproxy, mrule->cond); err_code |= warnif_tcp_http_cond(curproxy, mrule->cond);
} }
/* find the target table for 'store response' rules */ /* find the target table for 'store response' rules */
list_for_each_entry(mrule, &curproxy->storersp_rules, list) { list_for_each_entry(mrule, &curproxy->storersp_rules, list) {
struct stktable *target;
curproxy->be_rsp_ana |= AN_RES_STORE_RULES; curproxy->be_rsp_ana |= AN_RES_STORE_RULES;
if (mrule->table.name) if (!resolve_stick_rule(curproxy, mrule))
target = stktable_find_by_name(mrule->table.name);
else
target = curproxy->table;
if (!target) {
ha_alert("Proxy '%s': unable to find store table '%s'.\n",
curproxy->id, mrule->table.name ? mrule->table.name : curproxy->id);
cfgerr++; cfgerr++;
}
else if (!stktable_compatible_sample(mrule->expr, target->type)) {
ha_alert("Proxy '%s': type of fetch not usable with type of stick-table '%s'.\n",
curproxy->id, mrule->table.name ? mrule->table.name : curproxy->id);
cfgerr++;
}
else {
ha_free(&mrule->table.name);
mrule->table.t = target;
stktable_alloc_data_type(target, STKTABLE_DT_SERVER_ID, NULL, NULL);
stktable_alloc_data_type(target, STKTABLE_DT_SERVER_KEY, NULL, NULL);
if (!in_proxies_list(target->proxies_list, curproxy)) {
curproxy->next_stkt_ref = target->proxies_list;
target->proxies_list = curproxy;
}
}
} }
/* check validity for 'tcp-request' layer 4/5/6/7 rules */ /* check validity for 'tcp-request' layer 4/5/6/7 rules */

35
src/proxy.c
View File

@ -130,6 +130,41 @@ const struct cfg_opt cfg_opts2[] =
{ NULL, 0, 0, 0 } { NULL, 0, 0, 0 }
}; };
/* Helper function to resolve a single sticking rule after config parsing.
* Returns 1 for success and 0 for failure
*/
int resolve_stick_rule(struct proxy *curproxy, struct sticking_rule *mrule)
{
struct stktable *target;
if (mrule->table.name)
target = stktable_find_by_name(mrule->table.name);
else
target = curproxy->table;
if (!target) {
ha_alert("Proxy '%s': unable to find stick-table '%s'.\n",
curproxy->id, mrule->table.name ? mrule->table.name : curproxy->id);
return 0;
}
else if (!stktable_compatible_sample(mrule->expr, target->type)) {
ha_alert("Proxy '%s': type of fetch not usable with type of stick-table '%s'.\n",
curproxy->id, mrule->table.name ? mrule->table.name : curproxy->id);
return 0;
}
/* success */
ha_free(&mrule->table.name);
mrule->table.t = target;
stktable_alloc_data_type(target, STKTABLE_DT_SERVER_ID, NULL, NULL);
stktable_alloc_data_type(target, STKTABLE_DT_SERVER_KEY, NULL, NULL);
if (!in_proxies_list(target->proxies_list, curproxy)) {
curproxy->next_stkt_ref = target->proxies_list;
target->proxies_list = curproxy;
}
return 1;
}
static void free_stick_rules(struct list *rules) static void free_stick_rules(struct list *rules)
{ {
struct sticking_rule *rule, *ruleb; struct sticking_rule *rule, *ruleb;