Skip to content
Permalink
Browse files

Revert "kill stale oc for backend synth"

This reverts commit de3e581.

tests/saintmode/test04.vtc from varnish-modules revealed that there may
be use cases where it is implied that vcl_backend_error will leave a
ttl=0 object and the sale object will remain in place.

This can be resolved by:

	- return(abandon) for these cases or
	- making the HSH_Kill conditional on bo->fetch_objcore->ttl > 0

but I already has concerns regarding the impact of this change and have
them even more now.

We need time to ponder about the consequences and a documented
inefficiency is better than unexpected behaviour in a release.
  • Loading branch information...
nigoroll committed Mar 15, 2019
1 parent 38e70fa commit 5014b338a9bc6e2304c8b4e74b0ad32204a5ecc9
Showing with 0 additions and 35 deletions.
  1. +0 −2 bin/varnishd/cache/cache_fetch.c
  2. +0 −33 bin/varnishtest/tests/r02946.vtc
@@ -776,8 +776,6 @@ vbf_stp_error(struct worker *wrk, struct busyobj *bo)
VSB_destroy(&synth_body);
HSH_Unbusy(wrk, bo->fetch_objcore);
ObjSetState(wrk, bo->fetch_objcore, BOS_FINISHED);
if (bo->stale_oc != NULL)
HSH_Kill(bo->stale_oc);
return (F_STP_DONE);
}

This file was deleted.

Oops, something went wrong.

0 comments on commit 5014b33

Please sign in to comment.
You can’t perform that action at this time.