Skip to content

U
unique-xids
Commit fbf34247 authored by Martin Blix Grydeland's avatar Martin Blix Grydeland
Browse files
Options

Add consistency checks between the ban lists at startup

parent 445f3c53
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 3 deletions
bin/varnishd/storage/storage_persistent.c
View file @ fbf34247
......@@ -343,9 +343,18 @@ smp_open(const struct stevedore *st)
sc->ident = SIGN_DATA(&sc->idn);
/* We attempt ban1 first, and if that fails, try ban2 */
if (smp_open_bans(sc, &sc->ban1))
AZ(smp_open_bans(sc, &sc->ban2));
/* Check ban lists */
if (smp_chk_signspace(&sc->ban1)) {
/* Ban list 1 is broken, use ban2 */
AZ(smp_chk_signspace(&sc->ban2));
smp_copy_signspace(&sc->ban1, &sc->ban2);
smp_sync_sign(&sc->ban1.ctx);
} else {
/* Ban1 is OK, copy to ban2 for consistency */
smp_copy_signspace(&sc->ban2, &sc->ban1);
smp_sync_sign(&sc->ban2.ctx);
}
AZ(smp_open_bans(sc, &sc->ban1));
/* We attempt seg1 first, and if that fails, try seg2 */
if (smp_open_segs(sc, &sc->seg1))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment