[master] cb6ef1196 Remove the opportunistic COOLING check

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Fri Dec 27 07:59:06 UTC 2019


commit cb6ef119673fda4891f570a14f27fa638b89c9f6
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Dec 27 08:52:36 2019 +0100

    Remove the opportunistic COOLING check
    
    Otherwise at this point nothing is undone. And backend creation while a
    VCL is stuck in the COOLING state should be unlikely enough that we can
    assume the happy path by default.
    
    Refs #3176

diff --git a/bin/varnishd/cache/cache_vrt_vcl.c b/bin/varnishd/cache/cache_vrt_vcl.c
index cc332e96c..2c63b4b1a 100644
--- a/bin/varnishd/cache/cache_vrt_vcl.c
+++ b/bin/varnishd/cache/cache_vrt_vcl.c
@@ -159,10 +159,6 @@ VRT_AddDirector(VRT_CTX, const struct vdi_methods *m, void *priv,
 	vcl = ctx->vcl;
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
 
-	// opportunistic, re-checked again under lock
-	if (vcl->temp == VCL_TEMP_COOLING && !DO_DEBUG(DBG_VTC_MODE))
-		return (NULL);
-
 	ALLOC_OBJ(vdir, VCLDIR_MAGIC);
 	AN(vdir);
 	ALLOC_OBJ(vdir->dir, DIRECTOR_MAGIC);


More information about the varnish-commit mailing list