From: Amaury Denoyelle Date: Mon, 23 Aug 2021 12:05:07 +0000 (+0200) Subject: MINOR: server: mark referenced servers as non purgeable X-Git-Tag: v2.5-dev5~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0626961ad3d3153f6761dbdd4336296acbde0864;p=thirdparty%2Fhaproxy.git MINOR: server: mark referenced servers as non purgeable Mark servers that are referenced by configuration elements as non purgeable. This includes the following list : - tracked servers - servers referenced in a use-server rule - servers referenced in a sample fetch --- diff --git a/src/cfgparse.c b/src/cfgparse.c index 647d085f59..2890fbf971 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -2841,6 +2841,7 @@ int check_config_validity() } ha_free(&srule->srv.name); srule->srv.ptr = target; + target->flags |= SRV_F_NON_PURGEABLE; } /* find the target table for 'stick' rules */ diff --git a/src/sample.c b/src/sample.c index d02034cf08..c712563635 100644 --- a/src/sample.c +++ b/src/sample.c @@ -1214,6 +1214,8 @@ int smp_resolve_args(struct proxy *p, char **err) break; } + srv->flags |= SRV_F_NON_PURGEABLE; + chunk_destroy(&arg->data.str); arg->unresolved = 0; arg->data.srv = srv; diff --git a/src/server.c b/src/server.c index fdce968f08..e055fc2c15 100644 --- a/src/server.c +++ b/src/server.c @@ -4928,6 +4928,7 @@ int srv_apply_track(struct server *srv, struct proxy *curproxy) srv->track = strack; srv->tracknext = strack->trackers; strack->trackers = srv; + strack->flags |= SRV_F_NON_PURGEABLE; ha_free(&srv->trackit);