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

BUG/MEDIUM: spoe: initialization depending on nbthread must be done last

Browse Source 
The agent used to be configured depending on global.nbthread while nbthread
may be set after the agent is parsed. Let's move this part to the spoe_check()
function to make sure nbthread is always correct and arrays are appropriately
sized.

This fix must be backported to 1.9 and 1.8.
This commit is contained in:
Willy Tarreau 2019-02-07 13:40:33 +01:00
parent b784b35ce8
commit b0769b2ed6
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/flt_spoe.c
View File

@ -3028,6 +3028,7 @@ spoe_check(struct proxy *px, struct flt_conf *fconf)
struct flt_conf *f; struct flt_conf *f;
struct spoe_config *conf = fconf->conf; struct spoe_config *conf = fconf->conf;
struct proxy *target; struct proxy *target;
int i;
/* Check all SPOE filters for proxy <px> to be sure all SPOE agent names /* Check all SPOE filters for proxy <px> to be sure all SPOE agent names
* are uniq */ * are uniq */
@ -3073,6 +3074,24 @@ spoe_check(struct proxy *px, struct flt_conf *fconf)
return 1; return 1;
} }
/* finish per-thread agent initialization */
if (global.nbthread == 1)
conf->agent->flags |= SPOE_FL_ASYNC;
if ((curagent->rt = calloc(global.nbthread, sizeof(*curagent->rt))) == NULL) {
ha_alert("Proxy %s : out of memory initializing SPOE agent '%s' declared at %s:%d.\n",
px->id, conf->agent->id, conf->agent->conf.file, conf->agent->conf.line);
return 1;
}
for (i = 0; i < global.nbthread; ++i) {
curagent->rt[i].frame_size = curagent->max_frame_size;
curagent->rt[i].processing = 0;
LIST_INIT(&curagent->rt[i].applets);
LIST_INIT(&curagent->rt[i].sending_queue);
LIST_INIT(&curagent->rt[i].waiting_queue);
HA_SPIN_INIT(&curagent->rt[i].lock);
}
free(conf->agent->b.name); free(conf->agent->b.name);
conf->agent->b.name = NULL; conf->agent->b.name = NULL;
conf->agent->b.be = target; conf->agent->b.be = target;
@ -3348,8 +3367,6 @@ cfg_parse_spoe_agent(const char *file, int linenum, char **args, int kwm)
curagent->var_t_process = NULL; curagent->var_t_process = NULL;
curagent->var_t_total = NULL; curagent->var_t_total = NULL;
curagent->flags = (SPOE_FL_PIPELINING | SPOE_FL_SND_FRAGMENTATION); curagent->flags = (SPOE_FL_PIPELINING | SPOE_FL_SND_FRAGMENTATION);
if (global.nbthread == 1)
curagent->flags |= SPOE_FL_ASYNC;
curagent->cps_max = 0; curagent->cps_max = 0;
curagent->eps_max = 0; curagent->eps_max = 0;
curagent->max_frame_size = MAX_FRAME_SIZE; curagent->max_frame_size = MAX_FRAME_SIZE;
@ -3359,20 +3376,6 @@ cfg_parse_spoe_agent(const char *file, int linenum, char **args, int kwm)
LIST_INIT(&curagent->events[i]); LIST_INIT(&curagent->events[i]);
LIST_INIT(&curagent->groups); LIST_INIT(&curagent->groups);
LIST_INIT(&curagent->messages); LIST_INIT(&curagent->messages);
if ((curagent->rt = calloc(global.nbthread, sizeof(*curagent->rt))) == NULL) {
ha_alert("parsing [%s:%d] : out of memory.\n", file, linenum);
err_code |= ERR_ALERT | ERR_ABORT;
goto out;
}
for (i = 0; i < global.nbthread; ++i) {
curagent->rt[i].frame_size = curagent->max_frame_size;
curagent->rt[i].processing = 0;
LIST_INIT(&curagent->rt[i].applets);
LIST_INIT(&curagent->rt[i].sending_queue);
LIST_INIT(&curagent->rt[i].waiting_queue);
HA_SPIN_INIT(&curagent->rt[i].lock);
}
} }
else if (!strcmp(args[0], "use-backend")) { else if (!strcmp(args[0], "use-backend")) {
if (!*args[1]) { if (!*args[1]) {