ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402633 )
Change subject: add dumps config settings stanzas for labs testing
......................................................................
add dumps config settings stanzas for labs testing
Change-Id: Idf94b66efd1ceb3b3aace3fd56022b086626aaf0
---
M modules/snapshot/manifests/dumps/configs.pp
M modules/snapshot/manifests/dumps/dblists.pp
2 files changed, 71 insertions(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/manifests/dumps/configs.pp
b/modules/snapshot/manifests/dumps/configs.pp
index bd510ec..17e9585 100644
--- a/modules/snapshot/manifests/dumps/configs.pp
+++ b/modules/snapshot/manifests/dumps/configs.pp
@@ -136,7 +136,55 @@
},
media => {
skipdblist =>
"${dblistsdir}/skipmonitor.dblist,${dblistsdir}/globalusage.dblist",
- }
+ },
+ },
+ }
+
+ $labsconfig = {
+ allwikis => {
+ global => {
+ dblist => "${apachedir}/dblists/all-labs.dblist",
+ closedlist => "${apachedir}/dblists/closed-labs.dblist",
+ flowlist => "${apachedir}/dblists/flow_only_labs.dblist",
+ skipdblist => "${dblistsdir}/skip-labs.dblist",
+ keep => '2',
+ chunksEnabled => '0',
+ },
+ big => {
+ dblist => "${dblistsdir}/labs_bigwikis.dblist",
+ closedlist => "${apachedir}/dblists/closed-labs.dblist",
+ flowlist =>
"${apachedir}/dblists/flow_only_labs.dblist",
+ skipdblist => "${dblistsdir}/skipmonitor.dblist",
+ keep => '2',
+ chunksEnabled => '1',
+ chunksForAbstract => '4',
+ chunksForPagelogs => '4',
+ checkpointTime => '720',
+ recombineHistory => '0',
+ revsPerJob => '70000',
+ retryWait => '30',
+ maxRetries => '3',
+ revsMargin => '20',
+ fixeddumporder => '1',
+ wikis => {
+ enwiki => {
+ pagesPerChunkHistory => '20000,40000,70000,80000',
+ pagesPerChunkAbstract => '4000',
+ },
+ simplewiki => {
+ pagesPerChunkHistory => '20000,50000,90000,140000',
+ pagesPerChunkAbstract => '60000',
+ },
+ wikidatawiki => {
+ pagesPerChunkHistory => '540000,30000,20000,30000',
+ pagesPerChunkAbstract => '25000',
+ },
+ },
+ },
+ en => {},
+ wd => {},
+ monitor => {},
+ media => {},
},
}
@@ -150,6 +198,15 @@
tempdir => $tempdir,
}
+ # for xml/sql dumps testing in beta
+ snapshot::dumps::wikiconf { 'wikidump.conf.labs':
+ configtype => 'allwikis',
+ config => $labsconfig,
+ publicdir => $publicdir,
+ privatedir => $privatedir,
+ tempdir => $tempdir,
+ }
+
file { "${confsdir}/table_jobs.yaml":
ensure => 'present',
path => "${confsdir}/table_jobs.yaml",
diff --git a/modules/snapshot/manifests/dumps/dblists.pp
b/modules/snapshot/manifests/dumps/dblists.pp
index d28843e..885c428 100644
--- a/modules/snapshot/manifests/dumps/dblists.pp
+++ b/modules/snapshot/manifests/dumps/dblists.pp
@@ -10,11 +10,16 @@
'zhwiki']
$bigwikis_dblist = join($bigwikis, "\n")
+ # for testing in deployment-prep
+ $labs_bigwikis = ['enwiki', 'simplewiki', 'wikidatawiki']
+ $labs_bigwikis_dblist = join($labs_bigwikis, "\n")
+
# labswiki(s) can't be dumped from snapshot hosts
$excludewikis = ['labswiki', 'labtestwiki']
$excludewikis_dblist = join($excludewikis, "\n")
$skip_dblist =
"${enwiki_dblist}\n${wikidatawiki_dblist}\n${bigwikis_dblist}\n${excludewikis_dblist}"
+ $skip_labs_dblist = $labs_bigwikis_dblist
$skipnone_dblist = ''
@@ -54,6 +59,14 @@
group => 'root',
content => "${skip_dblist}\n",
}
+ file { "${dblistsdir}/skip-labs.dblist":
+ ensure => 'present',
+ path => "${dblistsdir}/skip-labs.dblist",
+ mode => '0644',
+ owner => 'root',
+ group => 'root',
+ content => "${skip_labs_dblist}\n",
+ }
file { "${dblistsdir}/skipmonitor.dblist":
ensure => 'present',
path => "${dblistsdir}/skipmonitor.dblist",
--
To view, visit https://gerrit.wikimedia.org/r/402633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf94b66efd1ceb3b3aace3fd56022b086626aaf0
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
