[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_upload: do not set do_stream=true on Varnish 4

2016-09-14 Thread Ema (Code Review) 
Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310551

Change subject: cache_upload: do not set do_stream=true on Varnish 4
..

cache_upload: do not set do_stream=true on Varnish 4

Varnish 4 already defaults to streaming mode. There is no need to set
do_stream to true.

Bug: T131502
Change-Id: I6b1acadf3381c76f1a9a05e1ceae37595cb6ff2c
---
M templates/varnish/upload-backend.inc.vcl.erb
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/310551/1

diff --git a/templates/varnish/upload-backend.inc.vcl.erb 
b/templates/varnish/upload-backend.inc.vcl.erb
index 73482f3..312eec5 100644
--- a/templates/varnish/upload-backend.inc.vcl.erb
+++ b/templates/varnish/upload-backend.inc.vcl.erb
@@ -62,10 +62,12 @@
 <% end -%>
 
 sub cluster_be_backend_response {
+   <%- if not @varnish_version4 -%>
// Stream large objects, >= 1 MB
if (std.integer(beresp.http.Content-Length, 0) >= 1048576 || 
beresp.http.Content-Length ~ "^[0-9]{9}") {
set beresp.do_stream = true;
}
+   <%- end -%>
 
// Select a random big object storage backend for objects >= 100 MB
if (beresp.http.Content-Length ~ "^[0-9]{9}") {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b1acadf3381c76f1a9a05e1ceae37595cb6ff2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_upload: do not set do_stream=true on Varnish 4

2016-09-14 Thread Ema (Code Review) 
Ema has submitted this change and it was merged.

Change subject: cache_upload: do not set do_stream=true on Varnish 4
..


cache_upload: do not set do_stream=true on Varnish 4

Varnish 4 already defaults to streaming mode. There is no need to set
do_stream to true.

Bug: T131502
Change-Id: I6b1acadf3381c76f1a9a05e1ceae37595cb6ff2c
---
M templates/varnish/upload-backend.inc.vcl.erb
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/varnish/upload-backend.inc.vcl.erb 
b/templates/varnish/upload-backend.inc.vcl.erb
index 73482f3..312eec5 100644
--- a/templates/varnish/upload-backend.inc.vcl.erb
+++ b/templates/varnish/upload-backend.inc.vcl.erb
@@ -62,10 +62,12 @@
 <% end -%>
 
 sub cluster_be_backend_response {
+   <%- if not @varnish_version4 -%>
// Stream large objects, >= 1 MB
if (std.integer(beresp.http.Content-Length, 0) >= 1048576 || 
beresp.http.Content-Length ~ "^[0-9]{9}") {
set beresp.do_stream = true;
}
+   <%- end -%>
 
// Select a random big object storage backend for objects >= 100 MB
if (beresp.http.Content-Length ~ "^[0-9]{9}") {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b1acadf3381c76f1a9a05e1ceae37595cb6ff2c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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