Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Load VEXTs in manager #4172

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Load VEXTs in manager #4172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1846da5
mgt: load vexts already in the manager
nigoroll Sep 6, 2024
51447c4
mgt: Move -a(cceptor) and -s(torage) configuration until after VEXT load
nigoroll Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions bin/varnishd/mgt/mgt_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,6 @@ main(int argc, char * const *argv)
const char *h_arg = "critbit";
const char *n_arg = getenv("VARNISH_DEFAULT_N");
const char *S_arg = NULL;
const char *s_arg = "default,100m";
const char *W_arg = NULL;
const char *c;
char *p;
Expand Down Expand Up @@ -794,9 +793,6 @@ main(int argc, char * const *argv)
/* Process delayed arguments */
VTAILQ_FOREACH(alp, &arglist, list) {
switch(alp->arg[0]) {
case 'a':
VCA_Arg(alp->val);
break;
case 'f':
if (*alp->val != '\0')
alp->priv = mgt_f_read(alp->val);
Expand Down Expand Up @@ -827,9 +823,6 @@ main(int argc, char * const *argv)
case 'r':
MCF_ParamProtect(cli, alp->val);
break;
case 's':
STV_Config(alp->val);
break;
default:
break;
}
Expand Down Expand Up @@ -919,17 +912,32 @@ main(int argc, char * const *argv)
if (C_flag)
AZ(atexit(mgt_Cflag_atexit));

/* If no -s argument specified, process default -s argument */
vext_copyin(vident);
vext_load();

/* defaults if arguments not present */
if (!arg_list_count("s"))
STV_Config(s_arg);
(void) arg_list_add('s', "default,100m");

VTAILQ_FOREACH(alp, &arglist, list) {
switch(alp->arg[0]) {
case 'a':
VCA_Arg(alp->val);
break;
case 's':
STV_Config(alp->val);
break;
default:
break;
}
cli_check(cli);
}

/* Configure CLI and Transient storage, if user did not */
STV_Config_Final();

mgt_vcl_init();

vext_copyin(vident);

u = 0;
VTAILQ_FOREACH(alp, &arglist, list) {
if (!strcmp(alp->arg, "f") && alp->priv != NULL)
Expand Down
2 changes: 2 additions & 0 deletions bin/varnishtest/tests/c00003.vtc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
varnishtest "Check that we fail to start with erroneous -a/-b arguments"

setenv VARNISH_DEFAULT_N ${tmpdir}

# Duplicate -a arguments
# XXX: this cannot be tested reliably, we tolerate port collision
shell -err -match "have same address|already in use|Address in use" {
Expand Down