Ema has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/359401 )
Change subject: VCL: apply API rate limits to wikidata too ...................................................................... VCL: apply API rate limits to wikidata too WDQS Updater hits Wikidata's /wiki/Special:EntityData/ from non-WMF IPs at a rate higher than 1000/50s (20/s long term). Bump Wikidata rate-limiting to 1000/10s, or 100/s long term. Bug: T163233 Bug: T168019 Ref: https://github.com/wikimedia/wikidata-query-rdf/blob/master/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java#L203 Change-Id: Iaadab7c9f033209a596569c8b62186127c2591a4 --- M modules/varnish/templates/text-frontend.inc.vcl.erb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Ema: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/varnish/templates/text-frontend.inc.vcl.erb b/modules/varnish/templates/text-frontend.inc.vcl.erb index 3e8e22d..613faad 100644 --- a/modules/varnish/templates/text-frontend.inc.vcl.erb +++ b/modules/varnish/templates/text-frontend.inc.vcl.erb @@ -212,14 +212,14 @@ // * Excluded for now: // * all WMF IPs (including labs) // * seemingly-authenticated requests (simple cookie check) - // * RB and MW API: 1000/10s (100/s long term, with 1000 burst) + // * RB and MW API, Wikidata: 1000/10s (100/s long term, with 1000 burst) // * All others: 1000/50s (20/s long term, with 1000 burst) // (current data leads us to believe sustaining 20/s should be // nearly impossible against standard MW outputs without // concurrency>1) if (req.http.Cookie !~ "([sS]ession|Token)=" && std.ip(req.http.X-Client-IP, "192.0.2.1") !~ wikimedia_nets) { - if (req.url ~ "^/(api/rest_v1/|w/api.php)") { + if (req.url ~ "^/(api/rest_v1/|w/api.php|wiki/Special:EntityData)") { if (vsthrottle.is_denied("rest:" + req.http.X-Client-IP, 1000, 10s)) { return (synth(429, "Too Many Requests")); } -- To view, visit https://gerrit.wikimedia.org/r/359401 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaadab7c9f033209a596569c8b62186127c2591a4 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ema <e...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
