[MediaWiki-commits] [Gerrit] operations/puppet[production]: VCL: fixups for synthetic error status

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: VCL: fixups for synthetic error status
......................................................................


VCL: fixups for synthetic error status

Also, vcl_backend_error should always generate a synthetic page,
as there is no content from an actual backend in this case.

Change-Id: If9fe979bf79f92c5746786ab29c93ff0695c2dcf
---
M modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
M modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
3 files changed, 7 insertions(+), 8 deletions(-)

Approvals:
  Ema: Looks good to me, but someone else must approve
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
index 5a2636f..7b2ddb4 100644
--- a/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
@@ -144,6 +144,7 @@
 // Varnish4 vcl_synth+vcl_backend_error
 
 sub vcl_synth {
+       set resp.http.X-CDIS = "int";
        call wm_common_xcache_deliver;
        if (resp.status > 400 && resp.status != 413) {
                call synth_errorpage;
@@ -152,9 +153,8 @@
 }
 
 sub vcl_backend_error {
-       if (beresp.status > 400 && beresp.status != 413) {
-               call backend_error_errorpage;
-       }
+       set beresp.http.X-CDIS = "int";
+       call backend_error_errorpage;
        return (deliver);
 }
 
diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
index c210fd9..51df845 100644
--- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
@@ -387,8 +387,7 @@
                        unset resp.http.X-CDIS;
                }
                if (!req.http.X-CDIS) {
-                       // internally-generated response (not a cache object 
hit, and not a miss|pass to a deeper layer either)
-                       set req.http.X-CDIS = "int";
+                       set req.http.X-CDIS = "bug";
                }
 
                // X-Cache-Int gets appended-to as we traverse cache layers
diff --git a/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
index c3ca69a..7c2156e 100644
--- a/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
@@ -429,6 +429,7 @@
 // Varnish4 vcl_synth+vcl_backend_error
 
 sub vcl_synth {
+       set resp.http.X-CDIS = "int";
        call deliver_synth_;
        call https_error_redirect;
        call cluster_fe_err_synth;
@@ -444,9 +445,8 @@
        if (beresp.status == 503 && bereq.retries == 0 && bereq.method ~ 
"^(GET|HEAD|OPTIONS|PUT|DELETE)$") {
                return(retry);
        }
-       if (beresp.status > 400 && beresp.status != 413) {
-               call backend_error_errorpage;
-       }
+       set beresp.http.X-CDIS = "int";
+       call backend_error_errorpage;
        return (deliver);
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/320975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If9fe979bf79f92c5746786ab29c93ff0695c2dcf
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits