[master] 63806461a cache_main: Change order of shutdown slightly

Nils Goroll nils.goroll at uplex.de
Thu Dec 11 16:26:04 UTC 2025


commit 63806461a205a11da12deb21051f654e35acee9e
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Dec 11 17:18:58 2025 +0100

    cache_main: Change order of shutdown slightly
    
    Until VCL_Shutdown() is complete, objects will get dereferenced, but if EXP is
    already shut down, they will starve in the exp inbox. So, conversely, EXP should
    stay alive until after VCL_Shutdown().

diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index 3c90d3a44..95ed67244 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -559,9 +559,9 @@ child_main(int sigmagic, size_t altstksz)
 
 	VCA_Shutdown();
 	BAN_Shutdown();
-	EXP_Shutdown();
 	STV_warn();
 	VCL_Shutdown();
+	EXP_Shutdown();
 	STV_close();
 
 	printf("Child dies\n");



More information about the varnish-commit mailing list