MINOR: cfgparse: finish to set up servers outside of the proxy setup loop
Till now servers were only initialized as part of the proxy setup loop,
which doesn't cover peers, tcp log, dns, lua etc. Let's move this part
out of this loop and instead iterate over all registered servers. This
way we're certain to visit them all.
The patch looks big but it's just a move of a large block with the
corresponding reindent (as can be checked with diff -b). It relies
on the two previous ones ("MINOR: server: add a global list of all
known servers and" and "CLEANUP: lua: set a dummy file name and line
number on the dummy servers").
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 5910513..c3c1ea9 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -3235,81 +3235,84 @@
/* update the mux */
newsrv->mux_proto = mux_ent;
}
-
- /* initialize idle conns lists */
- for (newsrv = curproxy->srv; newsrv; newsrv = newsrv->next) {
- int i;
+ }
- newsrv->available_conns_tree = calloc(global.nbthread, sizeof(*newsrv->available_conns_tree));
+ /***********************************************************/
+ /* At this point, target names have already been resolved. */
+ /***********************************************************/
- if (!newsrv->available_conns_tree) {
- ha_alert("parsing [%s:%d] : failed to allocate idle connections for server '%s'.\n",
- newsrv->conf.file, newsrv->conf.line, newsrv->id);
- cfgerr++;
- continue;
- }
+ /* we must finish to initialize certain things on the servers */
- for (i = 0; i < global.nbthread; i++)
- newsrv->available_conns_tree[i] = EB_ROOT;
+ list_for_each_entry(newsrv, &servers_list, global_list) {
+ /* initialize idle conns lists */
+ int i;
- if (newsrv->max_idle_conns != 0) {
- if (idle_conn_task == NULL) {
- idle_conn_task = task_new(MAX_THREADS_MASK);
- if (!idle_conn_task)
- goto err;
+ newsrv->available_conns_tree = calloc(global.nbthread, sizeof(*newsrv->available_conns_tree));
- idle_conn_task->process = srv_cleanup_idle_conns;
- idle_conn_task->context = NULL;
+ if (!newsrv->available_conns_tree) {
+ ha_alert("parsing [%s:%d] : failed to allocate idle connections for server '%s'.\n",
+ newsrv->conf.file, newsrv->conf.line, newsrv->id);
+ cfgerr++;
+ continue;
+ }
- for (i = 0; i < global.nbthread; i++) {
- idle_conns[i].cleanup_task = task_new(1UL << i);
- if (!idle_conns[i].cleanup_task)
- goto err;
- idle_conns[i].cleanup_task->process = srv_cleanup_toremove_conns;
- idle_conns[i].cleanup_task->context = NULL;
- HA_SPIN_INIT(&idle_conns[i].idle_conns_lock);
- MT_LIST_INIT(&idle_conns[i].toremove_conns);
- }
- }
+ for (i = 0; i < global.nbthread; i++)
+ newsrv->available_conns_tree[i] = EB_ROOT;
- newsrv->idle_conns_tree = calloc((unsigned short)global.nbthread, sizeof(*newsrv->idle_conns_tree));
- if (!newsrv->idle_conns_tree) {
- ha_alert("parsing [%s:%d] : failed to allocate idle connections for server '%s'.\n",
- newsrv->conf.file, newsrv->conf.line, newsrv->id);
- cfgerr++;
- continue;
- }
+ if (newsrv->max_idle_conns != 0) {
+ if (idle_conn_task == NULL) {
+ idle_conn_task = task_new(MAX_THREADS_MASK);
+ if (!idle_conn_task)
+ goto err;
- for (i = 0; i < global.nbthread; i++)
- newsrv->idle_conns_tree[i] = EB_ROOT;
+ idle_conn_task->process = srv_cleanup_idle_conns;
+ idle_conn_task->context = NULL;
- newsrv->safe_conns_tree = calloc(global.nbthread, sizeof(*newsrv->safe_conns_tree));
- if (!newsrv->safe_conns_tree) {
- ha_alert("parsing [%s:%d] : failed to allocate idle connections for server '%s'.\n",
- newsrv->conf.file, newsrv->conf.line, newsrv->id);
- cfgerr++;
- continue;
+ for (i = 0; i < global.nbthread; i++) {
+ idle_conns[i].cleanup_task = task_new(1UL << i);
+ if (!idle_conns[i].cleanup_task)
+ goto err;
+ idle_conns[i].cleanup_task->process = srv_cleanup_toremove_conns;
+ idle_conns[i].cleanup_task->context = NULL;
+ HA_SPIN_INIT(&idle_conns[i].idle_conns_lock);
+ MT_LIST_INIT(&idle_conns[i].toremove_conns);
}
-
- for (i = 0; i < global.nbthread; i++)
- newsrv->safe_conns_tree[i] = EB_ROOT;
+ }
- newsrv->curr_idle_thr = calloc(global.nbthread, sizeof(*newsrv->curr_idle_thr));
- if (!newsrv->curr_idle_thr)
- goto err;
+ newsrv->idle_conns_tree = calloc((unsigned short)global.nbthread, sizeof(*newsrv->idle_conns_tree));
+ if (!newsrv->idle_conns_tree) {
+ ha_alert("parsing [%s:%d] : failed to allocate idle connections for server '%s'.\n",
+ newsrv->conf.file, newsrv->conf.line, newsrv->id);
+ cfgerr++;
continue;
- err:
- ha_alert("parsing [%s:%d] : failed to allocate idle connection tasks for server '%s'.\n",
+ }
+
+ for (i = 0; i < global.nbthread; i++)
+ newsrv->idle_conns_tree[i] = EB_ROOT;
+
+ newsrv->safe_conns_tree = calloc(global.nbthread, sizeof(*newsrv->safe_conns_tree));
+ if (!newsrv->safe_conns_tree) {
+ ha_alert("parsing [%s:%d] : failed to allocate idle connections for server '%s'.\n",
newsrv->conf.file, newsrv->conf.line, newsrv->id);
cfgerr++;
continue;
}
+
+ for (i = 0; i < global.nbthread; i++)
+ newsrv->safe_conns_tree[i] = EB_ROOT;
+
+ newsrv->curr_idle_thr = calloc(global.nbthread, sizeof(*newsrv->curr_idle_thr));
+ if (!newsrv->curr_idle_thr)
+ goto err;
+ continue;
+ err:
+ ha_alert("parsing [%s:%d] : failed to allocate idle connection tasks for server '%s'.\n",
+ newsrv->conf.file, newsrv->conf.line, newsrv->id);
+ cfgerr++;
+ continue;
}
}
- /***********************************************************/
- /* At this point, target names have already been resolved. */
- /***********************************************************/
/* Check multi-process mode compatibility */