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

MINOR: sink: function to add new sink servers

Browse Source 
Move the sft creation part out of sink_finalize() function so that it
becomes possible to register sink's servers without forward_px being
set.
This commit is contained in:
Aurelien DARRAGON 2023-09-18 17:14:22 +02:00 committed by Christopher Faulet
parent 205d480d9f
commit 31e8a003a5
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/sink.c
View File

@ -844,6 +844,38 @@ static struct sink *sink_new_ringbuf(const char *id, const char *description,
return NULL; return NULL;
} }
/* helper function: add a new server to an existing sink
*
* Returns 1 on success and 0 on failure
*/
static int sink_add_srv(struct sink *sink, struct server *srv)
{
struct sink_forward_target *sft;
/* allocate new sink_forward_target descriptor */
sft = calloc(1, sizeof(*sft));
if (!sft) {
ha_alert("memory allocation error initializing server '%s' in ring '%s'.\n", srv->id, sink->name);
return 0;
}
sft->srv = srv;
sft->appctx = NULL;
sft->ofs = ~0; /* init ring offset */
sft->sink = sink;
sft->next = sink->sft;
HA_SPIN_INIT(&sft->lock);
/* mark server attached to the ring */
if (!ring_attach(sink->ctx.ring)) {
ha_alert("server '%s' sets too many watchers > 255 on ring '%s'.\n", srv->id, sink->name);
ha_free(&sft);
return 0;
}
sink->sft = sft;
srv = srv->next;
return 1;
}
/* Finalize sink struct to ensure configuration consistency and /* Finalize sink struct to ensure configuration consistency and
* allocate final struct members * allocate final struct members
* *
@ -868,32 +900,13 @@ static int sink_finalize(struct sink *sink)
/* prepare forward server descriptors */ /* prepare forward server descriptors */
if (sink->forward_px) { if (sink->forward_px) {
/* sink proxy is set: register all servers from the proxy */
srv = sink->forward_px->srv; srv = sink->forward_px->srv;
while (srv) { while (srv) {
struct sink_forward_target *sft; if (!sink_add_srv(sink, srv)) {
/* allocate sink_forward_target descriptor */
sft = calloc(1, sizeof(*sft));
if (!sft) {
ha_alert("memory allocation error initializing server '%s' in ring '%s'.\n", srv->id, sink->name);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
break; break;
} }
sft->srv = srv;
sft->appctx = NULL;
sft->ofs = ~0; /* init ring offset */
sft->sink = sink;
sft->next = sink->sft;
HA_SPIN_INIT(&sft->lock);
/* mark server attached to the ring */
if (!ring_attach(sink->ctx.ring)) {
ha_alert("server '%s' sets too many watchers > 255 on ring '%s'.\n", srv->id, sink->name);
err_code |= ERR_ALERT | ERR_FATAL;
ha_free(&sft);
break;
}
sink->sft = sft;
srv = srv->next; srv = srv->next;
} }
} }