[master] 0d88c11 Remove the last traces of saint-mode from the core code.

Poul-Henning Kamp phk at varnish-cache.org
Mon Sep 23 20:10:21 CEST 2013


commit 0d88c116717abf633bd4e760e52b70d574ce4523
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Sep 23 18:10:05 2013 +0000

    Remove the last traces of saint-mode from the core code.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 0b8b387..f626552 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -220,14 +220,7 @@ vbe_NewConn(void)
 }
 
 /*--------------------------------------------------------------------
- * It evaluates if a backend is healthy _for_a_specific_object_.
- * That means that it relies on req->objcore->objhead. This is mainly for
- * saint-mode, but also takes backend->healthy into account. If
- * cache_param->saintmode_threshold is 0, this is basically just a test of
- * backend->healthy.
- *
- * The threshold has to be evaluated _after_ the timeout check, otherwise
- * items would never time out once the threshold is reached.
+ * Test if backend is healthy and report when it last changed
  */
 
 unsigned
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index dc5f234..f990354 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -188,9 +188,6 @@ struct params {
 	/* How long time does the ban lurker sleep */
 	double			ban_lurker_sleep;
 
-	/* Max size of the saintmode list. 0 == no saint mode. */
-	unsigned		saintmode_threshold;
-
 	unsigned		syslog_cli_traffic;
 
 	unsigned		http_range_support;
diff --git a/bin/varnishd/mgt/mgt_param_tbl.c b/bin/varnishd/mgt/mgt_param_tbl.c
index ab4094b..311abe9 100644
--- a/bin/varnishd/mgt/mgt_param_tbl.c
+++ b/bin/varnishd/mgt/mgt_param_tbl.c
@@ -439,13 +439,6 @@ const struct parspec mgt_parspec[] = {
 		"A value of zero disables the ban lurker.",
 		0,
 		"0.01", "s" },
-	{ "saintmode_threshold", tweak_uint,
-		&mgt_param.saintmode_threshold, 0, UINT_MAX,
-		"The maximum number of objects held off by saint mode before "
-		"no further will be made to the backend until one times out.  "
-		"A value of 0 disables saintmode.",
-		EXPERIMENTAL,
-		"10", "objects" },
 	{ "http_range_support", tweak_bool, &mgt_param.http_range_support, 0, 0,
 		"Enable support for HTTP Range headers.\n",
 		0,



More information about the varnish-commit mailing list