[master] 5a6cf6c Add more panic detail on busyobjs.

Poul-Henning Kamp phk at FreeBSD.org
Mon Mar 24 17:33:56 CET 2014


commit 5a6cf6c74a71ccdd3bcb5257bb1d81ff432a684d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Mar 24 16:33:30 2014 +0000

    Add more panic detail on busyobjs.
    
    Remove a debugging message.

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index a01e771..575d049 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -283,6 +283,10 @@ pan_busyobj(const struct busyobj *bo)
 
 	VSB_printf(pan_vsp, "  busyobj = %p {\n", bo);
 	pan_ws(bo->ws, 4);
+	VSB_printf(pan_vsp, "  refcnt = %u\n", bo->refcount);
+	VSB_printf(pan_vsp, "  retries = %d\n", bo->retries);
+	VSB_printf(pan_vsp, "  failed = %d\n", bo->failed);
+	VSB_printf(pan_vsp, "  state = %d\n", (int)bo->state);
 #define BO_FLAG(l, r, w, d) if(bo->l) VSB_printf(pan_vsp, "    is_" #l "\n");
 #include "tbl/bo_flags.h"
 #undef BO_FLAG
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index c48dc37..b68031c 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -192,7 +192,6 @@ VRT_l_beresp_uncacheable(const struct vrt_ctx *ctx, unsigned a)
 		VSLb(ctx->vsl, SLT_VCL_Error,
 		    "Ignoring attempt to reset beresp.uncacheable");
 	} else if (a) {
-		VSLb(ctx->vsl, SLT_Debug, "XXXX: UNCACHEABLE %u" , a);
 		ctx->bo->uncacheable = 1;
 	}
 }



More information about the varnish-commit mailing list