[master] e8d2ab8fb Try to get the VSM cluster inconsistency fixed for good.
Poul-Henning Kamp
phk at FreeBSD.org
Tue Aug 13 11:10:10 UTC 2019
commit e8d2ab8fb2ac89fd4d630c0ed0dfbdc0bc395997
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Aug 13 11:08:18 2019 +0000
Try to get the VSM cluster inconsistency fixed for good.
Obsoletes: #3039
diff --git a/bin/varnishtest/tests/c00083.vtc b/bin/varnishtest/tests/c00083.vtc
index 67f52b612..3f79baae2 100644
--- a/bin/varnishtest/tests/c00083.vtc
+++ b/bin/varnishtest/tests/c00083.vtc
@@ -4,15 +4,47 @@ varnish v1 -vcl {
backend default { .host = "${bad_ip}"; }
} -start
+delay 1
+
process p1 {
nlines=`wc -l < ${tmpdir}/v1/_.vsm_child/_.index`
nminus=`grep -c '^-' ${tmpdir}/v1/_.vsm_child/_.index`
- echo NLINES $nlines NMINUS $nminus
+ echo CHILD NLINES $nlines NMINUS $nminus
} -dump -run
+# Useful for debugging
+process p2 {tail -F ${tmpdir}/v1/_.vsm_child/_.index} -dump -start
+process p3 {tail -F ${tmpdir}/v1/_.vsm_mgt/_.index} -dump -start
+
+varnish v1 -vcl {
+ backend b00 { .host = "${bad_ip}"; }
+ backend b01 { .host = "${bad_ip}"; }
+ backend b02 { .host = "${bad_ip}"; }
+ backend b03 { .host = "${bad_ip}"; }
+
+ sub vcl_recv {
+ set req.backend_hint = b00;
+ set req.backend_hint = b01;
+ set req.backend_hint = b02;
+ set req.backend_hint = b03;
+ }
+}
+
+varnish v1 -cliok vcl.list
+
+process p1 -run
+
+varnish v1 -cliok "vcl.use vcl1"
+varnish v1 -cliok "vcl.discard vcl2"
+
+delay 1
+
+process p1 -run
+
# The child process starts out with approx 37 VSM segments
-# so it takes 20 backends to cause a _.index rewrite.
-# Make it 25 to be safe.
+# and spent 10 lines on vcl2, so it takes ~ 15 backends to
+# cause a _.index rewrite.
+# Make it 20 to be on the safe side.
varnish v1 -vcl {
backend b00 { .host = "${bad_ip}"; }
backend b01 { .host = "${bad_ip}"; }
@@ -34,11 +66,6 @@ varnish v1 -vcl {
backend b17 { .host = "${bad_ip}"; }
backend b18 { .host = "${bad_ip}"; }
backend b19 { .host = "${bad_ip}"; }
- backend b20 { .host = "${bad_ip}"; }
- backend b21 { .host = "${bad_ip}"; }
- backend b22 { .host = "${bad_ip}"; }
- backend b23 { .host = "${bad_ip}"; }
- backend b24 { .host = "${bad_ip}"; }
sub vcl_recv {
set req.backend_hint = b00;
@@ -61,25 +88,54 @@ varnish v1 -vcl {
set req.backend_hint = b17;
set req.backend_hint = b18;
set req.backend_hint = b19;
- set req.backend_hint = b20;
- set req.backend_hint = b21;
- set req.backend_hint = b22;
- set req.backend_hint = b23;
- set req.backend_hint = b24;
}
}
varnish v1 -cliok vcl.list
+delay 1
+
process p1 -run
varnish v1 -cliok "vcl.use vcl1"
-varnish v1 -cliok "vcl.discard vcl2"
+varnish v1 -cliok "vcl.discard vcl3"
+
+delay 1
# Check that the _.index rewrite did happen
+
process p1 {
nlines=`wc -l < ${tmpdir}/v1/_.vsm_child/_.index`
nminus=`grep -c '^-' ${tmpdir}/v1/_.vsm_child/_.index`
- echo NLINES $nlines NMINUS $nminus
- test $nminus -lt 25
+ echo CHILD NLINES $nlines NMINUS $nminus
+ # cat ${tmpdir}/v1/_.vsm_child/_.index
+ test $nminus -lt 20
} -run
+
+# Now check the management process VSM
+
+process p1 {
+ nlines=`wc -l < ${tmpdir}/v1/_.vsm_mgt/_.index`
+ nminus=`grep -c '^-' ${tmpdir}/v1/_.vsm_mgt/_.index`
+ echo MGT NLINES $nlines NMINUS $nminus
+ # cat ${tmpdir}/v1/_.vsm_child/_.index
+ test $nminus -eq 0
+} -run
+
+varnish v1 -cliok "stop"
+
+delay 1
+
+process p1 {
+ nlines=`wc -l < ${tmpdir}/v1/_.vsm_mgt/_.index`
+ nminus=`grep -c '^-' ${tmpdir}/v1/_.vsm_mgt/_.index`
+ echo MGT NLINES $nlines NMINUS $nminus
+ # cat ${tmpdir}/v1/_.vsm_child/_.index
+ test $nminus -eq 2
+} -run
+
+varnish v1 -cliok "start"
+
+delay 1
+
+process p1 -run
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
index 1fc844f27..3bfb9ec56 100644
--- a/bin/varnishtop/varnishtop.c
+++ b/bin/varnishtop/varnishtop.c
@@ -353,6 +353,7 @@ main(int argc, char **argv)
ident = VSM_Dup(vut->vsm, "Arg", "-i");
else
ident = strdup("");
+ AN(ident);
vut->dispatch_f = accumulate;
vut->dispatch_priv = NULL;
if (once) {
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index e0194e8c9..8725124a7 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -423,6 +423,7 @@ VSC_Iter(struct vsc *vsc, struct vsm *vsm, VSC_iter_f *fiter, void *priv)
AN(vsm);
sp = VTAILQ_FIRST(&vsc->segs);
VSM_FOREACH(&ifantom, vsm) {
+ AN(ifantom.class);
if (strcmp(ifantom.class, VSC_CLASS) &&
strcmp(ifantom.class, VSC_DOC_CLASS))
continue;
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 13ccf67bb..270d601b2 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -239,6 +239,11 @@ vsm_delseg(struct vsm_seg *vg, int refsok)
CHECK_OBJ_NOTNULL(vg, VSM_SEG_MAGIC);
+ if (vg->flags & VSM_FLAG_CLUSTER) {
+ vg->flags &= ~VSM_FLAG_CLUSTER;
+ VTAILQ_REMOVE(&vg->set->clusters, vg, clist);
+ }
+
if (refsok && vg->refs) {
AZ(vg->flags & VSM_FLAG_STALE);
vg->flags |= VSM_FLAG_STALE;
@@ -252,8 +257,6 @@ vsm_delseg(struct vsm_seg *vg, int refsok)
if (vg->flags & VSM_FLAG_STALE)
VTAILQ_REMOVE(&vg->set->stale, vg, list);
- else if (vg->flags & VSM_FLAG_CLUSTER)
- VTAILQ_REMOVE(&vg->set->clusters, vg, clist);
else
VTAILQ_REMOVE(&vg->set->segs, vg, list);
VAV_Free(vg->av);
@@ -293,13 +296,12 @@ vsm_delset(struct vsm_set **p)
vsm_delseg(VTAILQ_FIRST(&vs->stale), 0);
while (!VTAILQ_EMPTY(&vs->segs))
vsm_delseg(VTAILQ_FIRST(&vs->segs), 0);
- while (!VTAILQ_EMPTY(&vs->clusters))
- vsm_delseg(VTAILQ_FIRST(&vs->clusters), 0);
+ assert(VTAILQ_EMPTY(&vs->clusters));
FREE_OBJ(vs);
}
static void
-vsm_wash_set(struct vsm_set *vs, int all)
+vsm_wash_set(const struct vsm_set *vs, int all)
{
struct vsm_seg *vg, *vg2;
@@ -486,13 +488,12 @@ vsm_vlu_plus(struct vsm *vd, struct vsm_set *vs, const char *line)
{
char **av;
int ac;
- struct vsm_seg *vg2;
+ struct vsm_seg *vg;
av = VAV_Parse(line + 1, &ac, 0);
if (av[0] != NULL || ac < 4 || ac > 6) {
- (void)(vsm_diag(vd,
- "vsm_vlu_plus: bad index (%d/%s)",
+ (void)(vsm_diag(vd, "vsm_vlu_plus: bad index (%d/%s)",
ac, av[0]));
VAV_Free(av);
return(-1);
@@ -506,25 +507,26 @@ vsm_vlu_plus(struct vsm *vd, struct vsm_set *vs, const char *line)
vs->vg->flags |= VSM_FLAG_MARKSCAN;
vs->vg = VTAILQ_NEXT(vs->vg, list);
} else {
- ALLOC_OBJ(vg2, VSM_SEG_MAGIC);
- AN(vg2);
- vg2->av = av;
- vg2->set = vs;
- vg2->flags = VSM_FLAG_MARKSCAN;
- vg2->serial = ++vd->serial;
+ ALLOC_OBJ(vg, VSM_SEG_MAGIC);
+ AN(vg);
+ vg->av = av;
+ vg->set = vs;
+ vg->flags = VSM_FLAG_MARKSCAN;
+ vg->serial = ++vd->serial;
+ VTAILQ_INSERT_TAIL(&vs->segs, vg, list);
if (ac == 4) {
- vg2->flags |= VSM_FLAG_CLUSTER;
- VTAILQ_INSERT_TAIL(&vs->clusters, vg2, clist);
- } else {
- VTAILQ_INSERT_TAIL(&vs->segs, vg2, list);
- vg2->cluster = vsm_findcluster(vs, vg2->av[1]);
+ vg->flags |= VSM_FLAG_CLUSTER;
+ VTAILQ_INSERT_TAIL(&vs->clusters, vg, clist);
+ } else if (*vg->av[2] != '0') {
+ vg->cluster = vsm_findcluster(vs, vg->av[1]);
+ AN(vg->cluster);
}
}
return (0);
}
static int
-vsm_vlu_minus(struct vsm *vd, struct vsm_set *vs, const char *line)
+vsm_vlu_minus(struct vsm *vd, const struct vsm_set *vs, const char *line)
{
char **av;
int ac;
@@ -533,19 +535,25 @@ vsm_vlu_minus(struct vsm *vd, struct vsm_set *vs, const char *line)
av = VAV_Parse(line + 1, &ac, 0);
if (av[0] != NULL || ac < 4 || ac > 6) {
- (void)(vsm_diag(vd,
- "vsm_vlu_minus: bad index (%d/%s)",
+ (void)(vsm_diag(vd, "vsm_vlu_minus: bad index (%d/%s)",
ac, av[0]));
VAV_Free(av);
return(-1);
}
- VTAILQ_FOREACH(vg, &vs->segs, list) {
+ /* Clustered segments cannot come before their cluster */
+ if (*av[2] != '0')
+ vg = vsm_findcluster(vs, av[1]);
+ else
+ vg = VTAILQ_FIRST(&vs->segs);
+
+ for (;vg != NULL; vg = VTAILQ_NEXT(vg, list)) {
if (!vsm_cmp_av(&vg->av[1], &av[1])) {
vsm_delseg(vg, 1);
break;
}
}
+ AN(vg);
VAV_Free(av);
return (0);
}
@@ -788,28 +796,36 @@ VSM__iter0(const struct vsm *vd, struct vsm_fantom *vf)
int
VSM__itern(struct vsm *vd, struct vsm_fantom *vf)
{
- struct vsm_seg *vg, *vg2;
+ struct vsm_seg *vg;
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
AN(vd->attached);
AN(vf);
if (vf->priv == 0) {
- vg2 = VTAILQ_FIRST(&vd->mgt->segs);
+ vg = VTAILQ_FIRST(&vd->mgt->segs);
+ if (vg == NULL)
+ return (0);
} else {
vg = vsm_findseg(vd, vf);
if (vg == NULL)
return (vsm_diag(vd, "VSM_FOREACH: inconsistency"));
- vg2 = VTAILQ_NEXT(vg, list);
- if (vg2 == NULL && vg->set == vd->mgt)
- vg2 = VTAILQ_FIRST(&vd->child->segs);
+ while (1) {
+ if (vg->set == vd->mgt && VTAILQ_NEXT(vg, list) == NULL)
+ vg = VTAILQ_FIRST(&vd->child->segs);
+ else
+ vg = VTAILQ_NEXT(vg, list);
+ if (vg == NULL)
+ return (0);
+ if (!(vg->flags & VSM_FLAG_CLUSTER))
+ break;
+ }
}
- if (vg2 == NULL)
- return (0);
memset(vf, 0, sizeof *vf);
- vf->priv = vg2->serial;
- vf->class = vg2->av[4];
- vf->ident = vg2->av[5];
+ vf->priv = vg->serial;
+ vf->class = vg->av[4];
+ vf->ident = vg->av[5];
+ AN(vf->class);
return (1);
}
More information about the varnish-commit
mailing list