Revert the return(refresh) patches

(better approach coming soon-ish)



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5078 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_center.c

@@ -830,11 +830,6 @@ cnt_lookup(struct sess *sp)
 	return (0);
 }
 
-static int
-cnt_refresh(struct sess *sp)
-{
-	return cnt_lookup(sp);
-}
 /*--------------------------------------------------------------------
  * We had a miss, ask VCL, proceed as instructed
  *
@@ -1070,9 +1065,6 @@ cnt_recv(struct sess *sp)
 		/* XXX: discard req body, if any */
 		sp->step = STP_LOOKUP;
 		return (0);
-	case VCL_RET_REFRESH:
-		sp->step = STP_REFRESH;
-		return (0);
 	case VCL_RET_PIPE:
 		if (sp->esis > 0) {
 			/* XXX: VSL something */
@@ -1217,7 +1209,6 @@ CNT_Session(struct sess *sp)
 	    sp->step == STP_FIRST ||
 	    sp->step == STP_START ||
 	    sp->step == STP_LOOKUP ||
-	    sp->step == STP_REFRESH ||
 	    sp->step == STP_RECV);
 
 	/*

bin/varnishd/cache_hash.c

@@ -402,8 +402,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	if (oc == NULL			/* We found no live object */
 	    && grace_oc != NULL		/* There is a grace candidate */
 	    && (busy_oc != NULL		/* Somebody else is already busy */
-	    || !VBE_Healthy(sp->t_req, sp->director, (uintptr_t)oh))
-	    && sp->step != STP_REFRESH) {
+	    || !VBE_Healthy(sp->t_req, sp->director, (uintptr_t)oh))) {
 					 /* Or it is impossible to fetch: */
 		o = grace_oc->obj;
 		CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
@@ -415,24 +414,16 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 		o = oc->obj;
 		CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
 		assert(oc->objhead == oh);
-		if (sp->step == STP_REFRESH) {
-			if (o->ttl >= sp->t_req) {
-				o->ttl = sp->t_req - 1;
-				o->grace = HSH_Grace(sp->grace);
-				EXP_Rearm(o);
-			}
-			o = NULL;
-		} else {
-			/* We found an object we like */
-			oc->refcnt++;
-			if (o->hits < INT_MAX)
-				o->hits++;
-			assert(oh->refcnt > 1);
-			Lck_Unlock(&oh->mtx);
-			assert(hash->deref(oh));
-			*poh = oh;
-			return (oc);
-		}
+
+		/* We found an object we like */
+		oc->refcnt++;
+		if (o->hits < INT_MAX)
+			o->hits++;
+		assert(oh->refcnt > 1);
+		Lck_Unlock(&oh->mtx);
+		assert(hash->deref(oh));
+		*poh = oh;
+		return (oc);
 	}
 
 	if (busy_oc != NULL) {

bin/varnishd/steps.h

@@ -36,7 +36,6 @@ STEP(start,	START)
 STEP(pipe,	PIPE)
 STEP(pass,	PASS)
 STEP(lookup,	LOOKUP)
-STEP(refresh,	REFRESH)
 STEP(miss,	MISS)
 STEP(hit,	HIT)
 STEP(fetch,	FETCH)

bin/varnishtest/tests/c00035.vtc

-# $Id: c00024.vtc 4651 2010-04-08 16:21:16Z phk $
-
-test "Test return(refresh) in vcl_recv"
-
-server s1 {
-        rxreq 
-        txresp -hdr "Inc: 1"
-        rxreq 
-        txresp -hdr "Inc: 2"
-} -start
-
-varnish v1 -vcl+backend { 
-	sub vcl_recv {
-		if (req.http.x-refresh == "1") {
-			return(refresh);
-		}
-	}
- } -start 
-
-client c1 {
-        txreq -url "/"
-        rxresp
-        expect resp.status == 200
-	expect resp.http.Inc == "1"
-        txreq -url "/"
-        rxresp
-        expect resp.status == 200
-	expect resp.http.Inc == "1"
-        txreq -url "/" -hdr "x-refresh: 1"
-        rxresp
-        expect resp.status == 200
-	expect resp.http.Inc == "2"
-        txreq -url "/"
-        rxresp
-        expect resp.status == 200
-	expect resp.http.Inc == "2"
-} -run
-

doc/sphinx/reference/vcl.rst

@@ -310,11 +310,6 @@ vcl_recv
   pipe    
     Switch to pipe mode.  Control will eventually pass to vcl_pipe.
 
-  refresh
-    Go through normal caching channels, but guarantee a cache miss even if
-    there is valid content in the cache, thereby performing a controlled
-    refresh of the content.
-
   lookup  
     Look up the requested object in the cache.  Control will
     eventually pass to vcl_hit or vcl_miss, depending on whether the

lib/libvcl/generate.py

@@ -84,7 +84,7 @@ tokens = {
 # Our methods and actions
 
 returns =(
-	('recv',	('error', 'pass', 'pipe', 'refresh','lookup',)),
+	('recv',	('error', 'pass', 'pipe', 'lookup',)),
 	('pipe',	('error', 'pipe',)),
 	('pass',	('error', 'restart', 'pass',)),
 	('hash',	('hash',)),