jenkins-bot has submitted this change and it was merged. Change subject: Move more confs to yaml ......................................................................
Move more confs to yaml * In the site matrix, it's www.wikidata.org, but we had here, https://wikidata.beta.wmflabs.org/w/api.php which seems to be where www redirects. But, should confirm this works in practice. Change-Id: I7ea08d37a39f94caf35370a3a9f740f489874b4a --- M conf/wmf/betalabs.localsettings.js M conf/wmf/localsettings.js M scap/environments/beta/vars.yaml M scap/templates/config.yaml.j2 M scap/vars.yaml 5 files changed, 29 insertions(+), 47 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/conf/wmf/betalabs.localsettings.js b/conf/wmf/betalabs.localsettings.js index 1dcf010..98317ea 100644 --- a/conf/wmf/betalabs.localsettings.js +++ b/conf/wmf/betalabs.localsettings.js @@ -1,41 +1,20 @@ "use strict"; exports.setup = function(parsoidConfig) { - parsoidConfig.setMwApi({ prefix: 'aawiki', uri: 'https://aa.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'arwiki', uri: 'https://ar.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'cawiki', uri: 'https://ca.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'commonswiki', uri: 'https://commons.wikimedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'dewiki', uri: 'https://de.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'dewiktionary', uri: 'https://de.wiktionary.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'en_rtlwiki', uri: 'https://en-rtl.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'enwiki', uri: 'https://en.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'enwikibooks', uri: 'https://en.wikibooks.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'enwikinews', uri: 'https://en.wikinews.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'enwikiquote', uri: 'https://en.wikiquote.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'enwikisource', uri: 'https://en.wikisource.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'enwikiversity', uri: 'https://en.wikiversity.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'enwikivoyage', uri: 'https://en.wikivoyage.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'enwiktionary', uri: 'https://en.wiktionary.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'eowiki', uri: 'https://eo.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'eswiki', uri: 'https://es.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'fawiki', uri: 'https://fa.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'hewiki', uri: 'https://he.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'hiwiki', uri: 'https://hi.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'jawiki', uri: 'https://ja.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'kowiki', uri: 'https://ko.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'labs', uri: 'https://deployment.wikimedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'loginwiki', uri: 'https://login.wikimedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'metawiki', uri: 'https://meta.wikimedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'nlwiki', uri: 'https://nl.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'ruwiki', uri: 'https://ru.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'simplewiki', uri: 'https://simple.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'sqwiki', uri: 'https://sq.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'testwiki', uri: 'https://test.wikimedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'ukwiki', uri: 'https://uk.wikipedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'wikidatawiki', uri: 'https://wikidata.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'zerowiki', uri: 'https://zero.wikimedia.beta.wmflabs.org/w/api.php' }); - parsoidConfig.setMwApi({ prefix: 'zhwiki', uri: 'https://zh.wikipedia.beta.wmflabs.org/w/api.php' }); + parsoidConfig.initMwApiMap(); - // the production enwiki: a work-around to be able to use the labs parsoid instance from RESTBase + Array.from(parsoidConfig.mwApiMap.values()).forEach(function(apiConf) { + parsoidConfig.removeMwApi(apiConf); + parsoidConfig.setMwApi({ + prefix: apiConf.prefix, + uri: apiConf.uri.replace(/\.org/, '.beta.wmflabs.org'), + }); + }); + + // Some wikis not found in the sitematrix + parsoidConfig.setMwApi({ prefix: 'labs', uri: 'https://deployment.wikimedia.beta.wmflabs.org/w/api.php' }); + parsoidConfig.setMwApi({ prefix: 'en_rtlwiki', uri: 'https://en-rtl.wikipedia.beta.wmflabs.org/w/api.php' }); + + // The production enwiki: a work-around to be able to use the labs parsoid instance from RESTBase parsoidConfig.setMwApi({ prefix: 'enwikiprod', uri: 'https://en.wikipedia.org/w/api.php' }); // Sample verbose logs diff --git a/conf/wmf/localsettings.js b/conf/wmf/localsettings.js index fe0e1ae..efb4cb2 100644 --- a/conf/wmf/localsettings.js +++ b/conf/wmf/localsettings.js @@ -1,16 +1,5 @@ "use strict"; -exports.setup = function( parsoidConfig ) { - // Use the API backends directly without hitting the text varnishes. - // API requests are not cacheable anyway. - parsoidConfig.defaultAPIProxyURI = 'http://api.svc.eqiad.wmnet'; - - // RESTBase uses 2 minutes timeouts for the first request - // and a higher value subsequently. - // - // Set a 3 minute timeout so that RESTBase retries have - // a chance of succeeding. - parsoidConfig.timeouts.request = 3*60*1000; // 3 minutes - +exports.setup = function(parsoidConfig) { // Sample these verbose logs to prevent overwhelm // 1% and 2% for empty/tr and empty/li is based on // seeing the volume in rt-testing. diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml index 33a5a26..df35050 100644 --- a/scap/environments/beta/vars.yaml +++ b/scap/environments/beta/vars.yaml @@ -1,2 +1,3 @@ localsettings: conf/wmf/betalabs.localsettings.js load_wmf: false +api_proxy: undefined diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 6487999..0801609 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -43,3 +43,15 @@ useSelser: true useBatchAPI: true usePHPPreProcessor: true + + # Use the API backends directly without hitting the text varnishes. + # API requests are not cacheable anyway. + defaultAPIProxyURI: <%= api_proxy %> + + # RESTBase uses 2 minutes timeouts for the first request + # and a higher value subsequently. + # + # Set a 3 minute timeout so that RESTBase retries have + # a chance of succeeding. + timeouts: + request: 180000 # 3 minutes diff --git a/scap/vars.yaml b/scap/vars.yaml index bb8bb0a..10cfdaf 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -12,3 +12,4 @@ port: 8000 localsettings: conf/wmf/localsettings.js load_wmf: true +api_proxy: "http://api.svc.eqiad.wmnet"; -- To view, visit https://gerrit.wikimedia.org/r/323430 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ea08d37a39f94caf35370a3a9f740f489874b4a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Arlolra <abrea...@wikimedia.org> Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
