ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355149 )
Change subject: improve names of dump command lists
......................................................................
improve names of dump command lists
since "nocreate" is redundant now, lose that in the name
since we run either partial or full runs, change "normal" to
"full" everywhere
Change-Id: I75bfc42c0d86f60ae0585a88fec9aa863d848e71
---
M modules/snapshot/manifests/dumps/stagesconf.pp
M modules/snapshot/manifests/dumps/stagesconfig.pp
M modules/snapshot/templates/dumps/dumpstages.erb
M modules/snapshot/templates/dumps/fulldumps.sh.erb
4 files changed, 28 insertions(+), 28 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/manifests/dumps/stagesconf.pp
b/modules/snapshot/manifests/dumps/stagesconf.pp
index 4e869bf..48b7ae5 100644
--- a/modules/snapshot/manifests/dumps/stagesconf.pp
+++ b/modules/snapshot/manifests/dumps/stagesconf.pp
@@ -1,5 +1,5 @@
define snapshot::dumps::stagesconf(
- $stagestype = 'normal_nocreate',
+ $stagestype = 'full',
$stages = undef,
) {
diff --git a/modules/snapshot/manifests/dumps/stagesconfig.pp
b/modules/snapshot/manifests/dumps/stagesconfig.pp
index aca5254..9052faa 100644
--- a/modules/snapshot/manifests/dumps/stagesconfig.pp
+++ b/modules/snapshot/manifests/dumps/stagesconfig.pp
@@ -37,28 +37,28 @@
skipjob_args => "--skipjobs ${jobs_to_skip}",
}
- snapshot::dumps::stagesconf { 'stages_normal_nocreate':
- stagestype => 'normal_nocreate',
+ snapshot::dumps::stagesconf { 'stages_full':
+ stagestype => 'full',
stages => $stages,
}
- snapshot::dumps::stagesconf { 'stages_partial_nocreate':
- stagestype => 'partial_nocreate',
+ snapshot::dumps::stagesconf { 'stages_partial':
+ stagestype => 'partial',
stages => $stages,
}
- snapshot::dumps::stagesconf { 'stages_normal_nocreate_enwiki':
- stagestype => 'normal_nocreate_enwiki',
+ snapshot::dumps::stagesconf { 'stages_full_enwiki':
+ stagestype => 'full_enwiki',
stages => $stages,
}
- snapshot::dumps::stagesconf { 'stages_partial_nocreate_enwiki':
- stagestype => 'partial_nocreate_enwiki',
+ snapshot::dumps::stagesconf { 'stages_partial_enwiki':
+ stagestype => 'partial_enwiki',
stages => $stages,
}
- snapshot::dumps::stagesconf { 'stages_normal_nocreate_wikidatawiki':
- stagestype => 'normal_nocreate_wikidatawiki',
+ snapshot::dumps::stagesconf { 'stages_full_wikidatawiki':
+ stagestype => 'full_wikidatawiki',
stages => $stages,
}
- snapshot::dumps::stagesconf { 'stages_partial_nocreate_wikidatawiki':
- stagestype => 'partial_nocreate_wikidatawiki',
+ snapshot::dumps::stagesconf { 'stages_partial_wikidatawiki':
+ stagestype => 'partial_wikidatawiki',
stages => $stages,
}
snapshot::dumps::stagesconf { 'stages_create_smallwikis':
diff --git a/modules/snapshot/templates/dumps/dumpstages.erb
b/modules/snapshot/templates/dumps/dumpstages.erb
index 7ae5626..73c2a02 100644
--- a/modules/snapshot/templates/dumps/dumpstages.erb
+++ b/modules/snapshot/templates/dumps/dumpstages.erb
@@ -27,7 +27,7 @@
1 8 continue none <%= @stages['bigwikis']['firststage'] %> --job createdirs
--sleep 5
<% end -%>
-<% if @stagestype == 'normal_nocreate' or @stagestype == 'partial_nocreate' %>
+<% if @stagestype == 'full' or @stagestype == 'partial' %>
# stubs and then tables so inconsistencies between stubs and tables aren't too
huge
1 max continue none <%= @stages['smallwikis']['rest'] -%> --job xmlstubsdump;
<%= @stages['smallwikis']['rest'] %> --job tables
# stubs, recombines, tables for big wikis
@@ -48,13 +48,13 @@
# articles, recombine plus meta pages for big wikis
4 max continue none <%= @stages['bigwikis']['rest'] -%> --job
metacurrentdump,metacurrentdumprecombine
-<% if @stagestype == 'normal_nocreate' %>
+<% if @stagestype == 'full' %>
# all remaining jobs
1 max continue none <%= @stages['smallwikis']['rest'] %>
4 max continue none <%= @stages['bigwikis']['rest'] %>
<% end -%>
-<% if @stagestype == 'partial_nocreate' %>
+<% if @stagestype == 'partial' %>
# all remaining jobs except for the history revs
1 max continue none <%= @stages['smallwikis']['rest'] %> <%=
@stages['skipjob_args'] %>
4 max continue none <%= @stages['bigwikis']['rest'] %> <%=
@stages['skipjob_args'] %>
@@ -62,7 +62,7 @@
<% end -%>
-<% if @stagestype == 'normal_nocreate_enwiki' or @stagestype ==
'partial_nocreate_enwiki' %>
+<% if @stagestype == 'full_enwiki' or @stagestype == 'partial_enwiki' %>
# stubs, stubs recombine
27 1 continue none <%= @stages['enwiki']['rest'] -%> --job
xmlstubsdump,xmlstubsdumprecombine
# tables next so inconsistencies between stubs and tables aren't too huge
@@ -74,19 +74,19 @@
# articles plus meta pages
27 1 continue none <%= @stages['enwiki']['rest'] -%> --job
metacurrentdump,metacurrentdumprecombine
-<% if @stagestype == 'normal_nocreate_enwiki' %>
+<% if @stagestype == 'full_enwiki' %>
# all remaining jobs
27 1 continue none <%= @stages['enwiki']['rest'] %>
<% end -%>
-<% if @stagestype == 'partial_nocreate_enwiki' %>
+<% if @stagestype == 'partial_enwiki' %>
# all remaining jobs except for the history revs
27 1 continue none <%= @stages['enwiki']['rest'] %> <%=
@stages['skipjob_args'] %>
<% end -%>
<% end -%>
-<% if @stagestype == 'normal_nocreate_wikidatawiki' or @stagestype ==
'partial_nocreate_wikidatawiki' %>
+<% if @stagestype == 'full_wikidatawiki' or @stagestype ==
'partial_wikidatawiki' %>
# stubs, stubs recombine
27 1 continue none <%= @stages['wikidatawiki']['rest'] -%> --job
xmlstubsdump,xmlstubsdumprecombine
# tables next so inconsistencies between stubs and tables aren't too huge
@@ -98,12 +98,12 @@
# articles plus meta pages
27 1 continue none <%= @stages['wikidatawiki']['rest'] -%> --job
metacurrentdump,metacurrentdumprecombine
-<% if @stagestype == 'normal_nocreate_wikidatawiki' %>
+<% if @stagestype == 'full_wikidatawiki' %>
# all remaining jobs
27 1 continue none <%= @stages['wikidatawiki']['rest'] %>
<% end -%>
-<% if @stagestype == 'partial_nocreate_wikidatawiki' %>
+<% if @stagestype == 'partial_wikidatawiki' %>
# all remaining jobs except for the history revs
27 1 continue none <%= @stages['wikidatawiki']['rest'] %> <%=
@stages['skipjob_args'] %>
<% end -%>
diff --git a/modules/snapshot/templates/dumps/fulldumps.sh.erb
b/modules/snapshot/templates/dumps/fulldumps.sh.erb
index 3ab6d23..c751ab9 100644
--- a/modules/snapshot/templates/dumps/fulldumps.sh.erb
+++ b/modules/snapshot/templates/dumps/fulldumps.sh.erb
@@ -178,14 +178,14 @@
case $dumptype in
'full')
- enstages="stages_normal_nocreate_enwiki"
- wikidatastages="stages_normal_nocreate_wikidatawiki"
- regularstages="stages_normal_nocreate"
+ enstages="stages_full_enwiki"
+ wikidatastages="stages_full_wikidatawiki"
+ regularstages="stages_full"
;;
'partial')
- enstages="stages_partial_nocreate_enwiki"
- wikidatastages="stages_partial_nocreate_wikidatawiki"
- regularstages="stages_partial_nocreate"
+ enstages="stages_partial_enwiki"
+ wikidatastages="stages_partial_wikidatawiki"
+ regularstages="stages_partial"
;;
'*')
echo "unknown dumptype $dumptype"
--
To view, visit https://gerrit.wikimedia.org/r/355149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75bfc42c0d86f60ae0585a88fec9aa863d848e71
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@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
