ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/355148 )
Change subject: remove some unused dump command lists
......................................................................
remove some unused dump command lists
we always do the dump directory creations separate from running
the actual dumps, remove all command lists that lump those
together
Change-Id: I11be74f6d159303a05c6a6a6cb3a3d4b00309a67
---
M modules/snapshot/manifests/dumps/stagesconf.pp
M modules/snapshot/manifests/dumps/stagesconfig.pp
M modules/snapshot/templates/dumps/dumpstages.erb
3 files changed, 12 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/355148/1
diff --git a/modules/snapshot/manifests/dumps/stagesconf.pp
b/modules/snapshot/manifests/dumps/stagesconf.pp
index d53587c..4e869bf 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',
+ $stagestype = 'normal_nocreate',
$stages = undef,
) {
diff --git a/modules/snapshot/manifests/dumps/stagesconfig.pp
b/modules/snapshot/manifests/dumps/stagesconfig.pp
index cb9f10b..aca5254 100644
--- a/modules/snapshot/manifests/dumps/stagesconfig.pp
+++ b/modules/snapshot/manifests/dumps/stagesconfig.pp
@@ -37,28 +37,12 @@
skipjob_args => "--skipjobs ${jobs_to_skip}",
}
- snapshot::dumps::stagesconf { 'stages_normal':
- stagestype => 'normal',
- stages => $stages,
- }
- snapshot::dumps::stagesconf { 'stages_partial':
- stagestype => 'partial',
- stages => $stages,
- }
snapshot::dumps::stagesconf { 'stages_normal_nocreate':
stagestype => 'normal_nocreate',
stages => $stages,
}
snapshot::dumps::stagesconf { 'stages_partial_nocreate':
stagestype => 'partial_nocreate',
- stages => $stages,
- }
- snapshot::dumps::stagesconf { 'stages_normal_enwiki':
- stagestype => 'normal_enwiki',
- stages => $stages,
- }
- snapshot::dumps::stagesconf { 'stages_partial_enwiki':
- stagestype => 'partial_enwiki',
stages => $stages,
}
snapshot::dumps::stagesconf { 'stages_normal_nocreate_enwiki':
@@ -69,24 +53,12 @@
stagestype => 'partial_nocreate_enwiki',
stages => $stages,
}
- snapshot::dumps::stagesconf { 'stages_normal_wikidatawiki':
- stagestype => 'normal_wikidatawiki',
- stages => $stages,
- }
- snapshot::dumps::stagesconf { 'stages_partial_wikidatawiki':
- stagestype => 'partial_wikidatawiki',
- stages => $stages,
- }
snapshot::dumps::stagesconf { 'stages_normal_nocreate_wikidatawiki':
stagestype => 'normal_nocreate_wikidatawiki',
stages => $stages,
}
snapshot::dumps::stagesconf { 'stages_partial_nocreate_wikidatawiki':
stagestype => 'partial_nocreate_wikidatawiki',
- stages => $stages,
- }
- snapshot::dumps::stagesconf { 'stages_create':
- stagestype => 'create',
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 d8d9e0c..7ae5626 100644
--- a/modules/snapshot/templates/dumps/dumpstages.erb
+++ b/modules/snapshot/templates/dumps/dumpstages.erb
@@ -7,19 +7,14 @@
# slots_used numcommands on_failure error_notify command
-<% if @stagestype == 'normal_enwiki' or @stagestype == 'partial_enwiki' or
@stagestype == 'create_enwiki' %>
+<% if @stagestype == 'create_enwiki' %>
# mark the start of the run for enwiki
1 1 continue none <%= @stages['enwiki']['firststage'] -%> --job createdirs
--sleep 5
<% end -%>
-<% if @stagestype == 'normal_wikidatawiki' or @stagestype ==
'partial_wikidatawiki' or @stagestype == 'create_wikidatawiki' %>
+<% if @stagestype == 'create_wikidatawiki' %>
# mark the start of the run for wikidatawiki
1 1 continue none <%= @stages['wikidatawiki']['firststage'] -%> --job
createdirs --sleep 5
-<% end -%>
-
-<% if @stagestype == 'normal' or @stagestype == 'partial' or @stagestype ==
'create' %>
-# mark the start of the run for all small, big wikis
-1 8 continue none <%= @stages['smallwikis']['firststage'] -%> --job createdirs
--sleep 5; <%= @stages['bigwikis']['firststage'] %> --job createdirs --sleep 5
<% end -%>
<% if @stagestype == 'create_small' %>
@@ -32,7 +27,7 @@
1 8 continue none <%= @stages['bigwikis']['firststage'] %> --job createdirs
--sleep 5
<% end -%>
-<% if @stagestype == 'normal' or @stagestype == 'partial' or @stagestype ==
'normal_nocreate' or @stagestype == 'partial_nocreate' %>
+<% if @stagestype == 'normal_nocreate' or @stagestype == 'partial_nocreate' %>
# 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
@@ -53,13 +48,13 @@
# articles, recombine plus meta pages for big wikis
4 max continue none <%= @stages['bigwikis']['rest'] -%> --job
metacurrentdump,metacurrentdumprecombine
-<% if @stagestype == 'normal' or @stagestype == 'normal_nocreate' %>
+<% if @stagestype == 'normal_nocreate' %>
# all remaining jobs
1 max continue none <%= @stages['smallwikis']['rest'] %>
4 max continue none <%= @stages['bigwikis']['rest'] %>
<% end -%>
-<% if @stagestype == 'partial' or @stagestype == 'partial_nocreate' %>
+<% if @stagestype == 'partial_nocreate' %>
# 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'] %>
@@ -67,7 +62,7 @@
<% end -%>
-<% if @stagestype == 'normal_enwiki' or @stagestype == 'partial_enwiki' or
@stagestype == 'normal_nocreate_enwiki' or @stagestype ==
'partial_nocreate_enwiki' %>
+<% if @stagestype == 'normal_nocreate_enwiki' or @stagestype ==
'partial_nocreate_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
@@ -79,19 +74,19 @@
# articles plus meta pages
27 1 continue none <%= @stages['enwiki']['rest'] -%> --job
metacurrentdump,metacurrentdumprecombine
-<% if @stagestype == 'normal_enwiki' or @stagestype ==
'normal_nocreate_enwiki' %>
+<% if @stagestype == 'normal_nocreate_enwiki' %>
# all remaining jobs
27 1 continue none <%= @stages['enwiki']['rest'] %>
<% end -%>
-<% if @stagestype == 'partial_enwiki' or @stagestype ==
'partial_nocreate_enwiki' %>
+<% if @stagestype == 'partial_nocreate_enwiki' %>
# all remaining jobs except for the history revs
27 1 continue none <%= @stages['enwiki']['rest'] %> <%=
@stages['skipjob_args'] %>
<% end -%>
<% end -%>
-<% if @stagestype == 'normal_wikidatawiki' or @stagestype ==
'partial_wikidatawiki' or @stagestype == 'normal_nocreate_wikidatawiki' or
@stagestype == 'partial_nocreate_wikidatawiki' %>
+<% if @stagestype == 'normal_nocreate_wikidatawiki' or @stagestype ==
'partial_nocreate_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
@@ -103,12 +98,12 @@
# articles plus meta pages
27 1 continue none <%= @stages['wikidatawiki']['rest'] -%> --job
metacurrentdump,metacurrentdumprecombine
-<% if @stagestype == 'normal_wikidatawiki' or @stagestype ==
'normal_nocreate_wikidatawiki' %>
+<% if @stagestype == 'normal_nocreate_wikidatawiki' %>
# all remaining jobs
27 1 continue none <%= @stages['wikidatawiki']['rest'] %>
<% end -%>
-<% if @stagestype == 'partial_wikidatawiki' or @stagestype ==
'partial_nocreate_wikidatawiki' %>
+<% if @stagestype == 'partial_nocreate_wikidatawiki' %>
# all remaining jobs except for the history revs
27 1 continue none <%= @stages['wikidatawiki']['rest'] %> <%=
@stages['skipjob_args'] %>
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/355148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11be74f6d159303a05c6a6a6cb3a3d4b00309a67
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
