Page MenuHomePhabricator
Paste P8597

(An Untitled Masterwork)
ActivePublic
Actions

Authored by • ema on Jun 7 2019, 10:33 AM.
Tags
None
Referenced Files
F29371847: raw.txt
Jun 7 2019, 10:33 AM
Subscribers
None
root@puppetmaster1001:~# puppet-merge
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9737, done
remote: Finding sources: 100% (6/6)
remote: Getting sizes: 100% (2/2)
remote: Compressing objects: 100% (9379/9379)
remote: Total 6 (delta 3), reused 3 (delta 3)
Unpacking objects: 100% (6/6), done.
From https://gerrit.wikimedia.org/r/operations/puppet
6c71d4d347..d715151c6e production -> origin/production
HEAD is 6c71d4d3473aaa1b6eab43c15447e3a2e85e33da, FETCH_HEAD is d715151c6e8d6e1dc2032a6596eb589e786af1c8. Reviewing changes...
diff --git a/modules/varnish/templates/upload-frontend.inc.vcl.erb b/modules/varnish/templates/upload-frontend.inc.vcl.erb
index 5fa2c81bb9..7209c5058e 100644
--- a/modules/varnish/templates/upload-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/upload-frontend.inc.vcl.erb
@@ -124,8 +124,8 @@ sub cluster_fe_ratelimit {
}
}
- // General upload rate limiting: 1000/10s (100/s long term, with 1000 burst)
- if (vsthrottle.is_denied("general:" + req.http.X-Client-IP, 1000, 10s)) {
+ // General upload rate limiting: 5000/10s (500/s long term, with 5000 burst)
+ if (vsthrottle.is_denied("general:" + req.http.X-Client-IP, 5000, 10s)) {
return (synth(429, "Too Many Requests"));
}
}
------------------------------
Ema: varnish: bump general upload rate limits (d715151c6e)
Merge these changes? (yes/no)? yes
Merging d715151c6e8d6e1dc2032a6596eb589e786af1c8...
git merge --ff-only d715151c6e8d6e1dc2032a6596eb589e786af1c8
Updating 6c71d4d347..d715151c6e
Fast-forward
modules/varnish/templates/upload-frontend.inc.vcl.erb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now d715151c6e8d6e1dc2032a6596eb589e786af1c8.
/root
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9737, done
remote: Finding sources: 100% (6/6)
remote: Getting sizes: 100% (2/2)
remote: Compressing objects: 100% (9379/9379)
remote: Total 6 (delta 3), reused 3 (delta 3)
Unpacking objects: 100% (6/6), done.
From https://gerrit.wikimedia.org/r/operations/puppet
6c71d4d347..d715151c6e production -> origin/production
HEAD is 6c71d4d3473aaa1b6eab43c15447e3a2e85e33da, FETCH_HEAD is d715151c6e8d6e1dc2032a6596eb589e786af1c8. Reviewing changes...
------------------------------
Merging d715151c6e8d6e1dc2032a6596eb589e786af1c8...
git merge --ff-only d715151c6e8d6e1dc2032a6596eb589e786af1c8
Updating 6c71d4d347..d715151c6e
Fast-forward
modules/varnish/templates/upload-frontend.inc.vcl.erb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now d715151c6e8d6e1dc2032a6596eb589e786af1c8.
/var/lib/git/operations/puppet
Connection to puppetmaster1002.eqiad.wmnet closed.
OK: puppet-merge on puppetmaster1002.eqiad.wmnet succeeded
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9737, done
remote: Finding sources: 100% (6/6)
remote: Getting sizes: 100% (2/2)
remote: Compressing objects: 100% (9379/9379)
remote: Total 6 (delta 3), reused 3 (delta 3)
Unpacking objects: 100% (6/6), done.
From https://gerrit.wikimedia.org/r/operations/puppet
6c71d4d347..d715151c6e production -> origin/production
HEAD is 6c71d4d3473aaa1b6eab43c15447e3a2e85e33da, FETCH_HEAD is d715151c6e8d6e1dc2032a6596eb589e786af1c8. Reviewing changes...
------------------------------
Merging d715151c6e8d6e1dc2032a6596eb589e786af1c8...
git merge --ff-only d715151c6e8d6e1dc2032a6596eb589e786af1c8
Updating 6c71d4d347..d715151c6e
Fast-forward
modules/varnish/templates/upload-frontend.inc.vcl.erb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now d715151c6e8d6e1dc2032a6596eb589e786af1c8.
/var/lib/git/operations/puppet
Connection to rhodium.eqiad.wmnet closed.
OK: puppet-merge on rhodium.eqiad.wmnet succeeded
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9737, done
remote: Finding sources: 100% (6/6)
remote: Getting sizes: 100% (2/2)
remote: Compressing objects: 100% (9379/9379)
remote: Total 6 (delta 3), reused 3 (delta 3)
Unpacking objects: 100% (6/6), done.
From https://gerrit.wikimedia.org/r/operations/puppet
6c71d4d347..d715151c6e production -> origin/production
HEAD is e2fd19b3a27256d5e0a8adf8bc2130a75cdc09e2, FETCH_HEAD is d715151c6e8d6e1dc2032a6596eb589e786af1c8. Reviewing changes...
------------------------------
WARNING: Revision range includes commits from multiple committers!
Merging d715151c6e8d6e1dc2032a6596eb589e786af1c8...
git merge --ff-only d715151c6e8d6e1dc2032a6596eb589e786af1c8
Updating e2fd19b3a2..d715151c6e
Fast-forward
modules/mediawiki/files/apache/sites/redirects/redirects.dat | 2 --
modules/mediawiki/lib/puppet/parser/functions/compile_redirects.rb | 5 -----
modules/varnish/templates/upload-frontend.inc.vcl.erb | 4 ++--
3 files changed, 2 insertions(+), 9 deletions(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now d715151c6e8d6e1dc2032a6596eb589e786af1c8.
/var/lib/git/operations/puppet
Connection to puppetmaster2001.codfw.wmnet closed.
OK: puppet-merge on puppetmaster2001.codfw.wmnet succeeded
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9737, done
remote: Finding sources: 100% (6/6)
remote: Getting sizes: 100% (2/2)
remote: Compressing objects: 100% (9379/9379)
remote: Total 6 (delta 3), reused 3 (delta 3)
Unpacking objects: 100% (6/6), done.
From https://gerrit.wikimedia.org/r/operations/puppet
6c71d4d347..d715151c6e production -> origin/production
HEAD is e2fd19b3a27256d5e0a8adf8bc2130a75cdc09e2, FETCH_HEAD is d715151c6e8d6e1dc2032a6596eb589e786af1c8. Reviewing changes...
------------------------------
WARNING: Revision range includes commits from multiple committers!
Merging d715151c6e8d6e1dc2032a6596eb589e786af1c8...
git merge --ff-only d715151c6e8d6e1dc2032a6596eb589e786af1c8
Updating e2fd19b3a2..d715151c6e
Fast-forward
modules/mediawiki/files/apache/sites/redirects/redirects.dat | 2 --
modules/mediawiki/lib/puppet/parser/functions/compile_redirects.rb | 5 -----
modules/varnish/templates/upload-frontend.inc.vcl.erb | 4 ++--
3 files changed, 2 insertions(+), 9 deletions(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now d715151c6e8d6e1dc2032a6596eb589e786af1c8.
/var/lib/git/operations/puppet
Connection to puppetmaster2002.codfw.wmnet closed.
OK: puppet-merge on puppetmaster2002.codfw.wmnet succeeded
Now running conftool-merge to sync any changes to conftool data
Running conftool-sync on /etc/conftool/data
2019-06-07 10:23:08 [INFO] conftool::yaml_log_error: Error parsing yaml file /etc/conftool/etcdrc: [Errno 2] No such file or directory: '/etc/conftool/etcdrc'
2019-06-07 10:23:09 [INFO] conftool::load_files: Loading data for entity discovery from /etc/conftool/data
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/discovery/mediawiki.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/discovery/services.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Loading data for entity mwconfig from /etc/conftool/data
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/mwconfig/data.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Loading data for entity service from /etc/conftool/data
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/mediawiki.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/services.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/cache.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/misc.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Loading data for entity node from /etc/conftool/data
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/eqsin.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/codfw.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/ulsfo.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/esams.yaml
2019-06-07 10:23:09 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/eqiad.yaml
2019-06-07 10:23:09 [INFO] conftool::load: Adding objects for service
2019-06-07 10:23:09 [INFO] conftool::load: Adding objects for discovery
2019-06-07 10:23:09 [INFO] conftool::load: Adding objects for mwconfig
2019-06-07 10:23:09 [INFO] conftool::load: Adding objects for node
2019-06-07 10:23:09 [INFO] conftool::load: Removing stale objects for node
2019-06-07 10:23:09 [INFO] conftool::load: Removing stale objects for mwconfig
2019-06-07 10:23:09 [INFO] conftool::load: Removing stale objects for discovery
2019-06-07 10:23:09 [INFO] conftool::load: Removing stale objects for service
Done.
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL