ArielGlenn has submitted this change and it was merged.
Change subject: dumps: move scheduler args out of dump arg list
......................................................................
dumps: move scheduler args out of dump arg list
so we can have multiple dump run commands on the same line
in the scheduler input, using the same scheduler args
Change-Id: Ie6c6c9dfcb303d943023fdbb951680f4ff802b47
---
M modules/snapshot/manifests/dumps/stagesconfig.pp
M modules/snapshot/templates/dumpstages.erb
2 files changed, 24 insertions(+), 24 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/manifests/dumps/stagesconfig.pp
b/modules/snapshot/manifests/dumps/stagesconfig.pp
index 32222ca..b42fe13 100644
--- a/modules/snapshot/manifests/dumps/stagesconfig.pp
+++ b/modules/snapshot/manifests/dumps/stagesconfig.pp
@@ -6,7 +6,7 @@
$firststage_args = '--cutoff today'
$rest_args= '--date last --onepass'
- $wikiargs = 'continue none /bin/bash ./worker --skipdone --exclusive --log'
+ $wikiargs = '/bin/bash ./worker --skipdone --exclusive --log'
$args_smallwikis = "${wikiargs} --configfile confs/wikidump.conf"
$args_bigwikis = "${wikiargs} --configfile confs/wikidump.conf.bigwikis"
diff --git a/modules/snapshot/templates/dumpstages.erb
b/modules/snapshot/templates/dumpstages.erb
index c6a247f..029c596 100644
--- a/modules/snapshot/templates/dumpstages.erb
+++ b/modules/snapshot/templates/dumpstages.erb
@@ -3,71 +3,71 @@
# slots_used numcommands on_failure error_notify command
<% if @stagestype == 'normal' or @stagestype == 'partial' %>
# mark the start of the run for all small, big wikis
-8 1 <%= @stages['smallwikis']['firststage'] -%> --job createdirs; <%=
@stages['bigwikis']['firststage'] %> --job createdirs
+8 1 continue none <%= @stages['smallwikis']['firststage'] -%> --job
createdirs; <%= @stages['bigwikis']['firststage'] %> --job createdirs
# stubs and then tables so inconsistencies between stubs and tables aren't too
huge
-1 8 <%= @stages['smallwikis']['rest'] -%> --job xmlstubsdump; <%=
@stages['smallwikis']['rest'] %> --job tables
+1 8 continue none <%= @stages['smallwikis']['rest'] -%> --job xmlstubsdump;
<%= @stages['smallwikis']['rest'] %> --job tables
# stubs, recombines, tables for big wikis
-4 2 <%= @stages['bigwikis']['rest'] -%> --job xmlstubsdump; <%=
@stages['bigwikis']['rest'] -%> --job xmlstubsdumprecombine; <%=
@stages['bigwikis']['rest'] -%> --job tables
+4 2 continue none <%= @stages['bigwikis']['rest'] -%> --job xmlstubsdump; <%=
@stages['bigwikis']['rest'] -%> --job xmlstubsdumprecombine; <%=
@stages['bigwikis']['rest'] -%> --job tables
# regular articles
-1 8 <%= @stages['smallwikis']['rest'] -%> --job articlesdump
+1 8 continue none <%= @stages['smallwikis']['rest'] -%> --job articlesdump
# regular articles, recombines for big wikis
-4 2 <%= @stages['bigwikis']['rest'] -%> --job articlesdump; <%=
@stages['bigwikis']['rest'] -%> --job articlesdumprecombine
+4 2 continue none <%= @stages['bigwikis']['rest'] -%> --job articlesdump; <%=
@stages['bigwikis']['rest'] -%> --job articlesdumprecombine
# regular articles multistream
-1 8 <%= @stages['smallwikis']['rest'] -%> --job articlesmultistreamdump
+1 8 continue none <%= @stages['smallwikis']['rest'] -%> --job
articlesmultistreamdump
# regular articles for big wikis multistream
-1 8 <%= @stages['bigwikis']['rest'] -%> --job articlesmultistreamdump
+1 8 continue none <%= @stages['bigwikis']['rest'] -%> --job
articlesmultistreamdump
# articles plus meta pages
-1 8 <%= @stages['smallwikis']['rest'] -%> --job metacurrentdump
+1 8 continue none <%= @stages['smallwikis']['rest'] -%> --job metacurrentdump
# articles, recombine plus meta pages for big wikis
-4 2 <%= @stages['bigwikis']['rest'] -%> --job metacurrentdump; <%=
@stages['bigwikis']['rest'] -%> --job metacurrentdumprecombine
+4 2 continue none <%= @stages['bigwikis']['rest'] -%> --job metacurrentdump;
<%= @stages['bigwikis']['rest'] -%> --job metacurrentdumprecombine
<% if @stagestype == 'normal' %>
# all remaining jobs
-1 8 <%= @stages['smallwikis']['rest'] %>
-4 2 <%= @stages['bigwikis']['rest'] %>
+1 8 continue none <%= @stages['smallwikis']['rest'] %>
+4 2 continue none <%= @stages['bigwikis']['rest'] %>
<% end -%>
<% if @stagestype == 'partial' %>
# all remaining jobs except for the history revs
-1 8 <%= @stages['smallwikis']['rest'] %> <%= @stages['skipjob_args'] %>
-4 2 <%= @stages['bigwikis']['rest'] %> <%= @stages['skipjob_args'] %>
+1 8 continue none <%= @stages['smallwikis']['rest'] %> <%=
@stages['skipjob_args'] %>
+4 2 continue none <%= @stages['bigwikis']['rest'] %> <%=
@stages['skipjob_args'] %>
<% end -%>
<% end -%>
<% if @stagestype == 'normal_huge' or @stagestype == 'partial_huge' %>
# stubs first
-27 1 <%= @stages['hugewikis']['firststage'] -%> --job xmlstubsdump
+27 1 continue none <%= @stages['hugewikis']['firststage'] -%> --job
xmlstubsdump
# tables next so inconsistencies between stubs and tables aren't too huge
-1 1 <%= @stages['hugewikis']['rest'] -%> --job tables
+1 1 continue none <%= @stages['hugewikis']['rest'] -%> --job tables
# recombine stubs for huge wikis
-1 1 <%= @stages['hugewikis']['rest'] -%> --job xmlstubsdumprecombine
+1 1 continue none <%= @stages['hugewikis']['rest'] -%> --job
xmlstubsdumprecombine
# regular articles
-27 1 <%= @stages['hugewikis']['rest'] -%> --job articlesdump
+27 1 continue none <%= @stages['hugewikis']['rest'] -%> --job articlesdump
# recombine articles for huge wikis
-1 1 <%= @stages['hugewikis']['rest'] -%> --job articlesdumprecombine
+1 1 continue none <%= @stages['hugewikis']['rest'] -%> --job
articlesdumprecombine
# regular articles multistream
-27 1 <%= @stages['hugewikis']['rest'] -%> --job articlesmultistreamdump
+27 1 continue none <%= @stages['hugewikis']['rest'] -%> --job
articlesmultistreamdump
# articles plus meta pages
-27 1 <%= @stages['hugewikis']['rest'] -%> --job metacurrentdump
+27 1 continue none <%= @stages['hugewikis']['rest'] -%> --job metacurrentdump
# recombine articles plus meta pages for huge wikis
-1 1 <%= @stages['hugewikis']['rest'] -%> --job metacurrentdumprecombine
+1 1 continue none <%= @stages['hugewikis']['rest'] -%> --job
metacurrentdumprecombine
<% if @stagestype == 'normal_huge' %>
# all remaining jobs
-27 1 <%= @stages['hugewikis']['rest'] %>
+27 1 continue none <%= @stages['hugewikis']['rest'] %>
<% end -%>
<% if @stagestype == 'partial_huge' %>
# all remaining jobs except for the history revs
-27 1 <%= @stages['hugewikis']['rest'] %> <%= @stages['skipjob_args'] %>
+27 1 continue none <%= @stages['hugewikis']['rest'] %> <%=
@stages['skipjob_args'] %>
<% end -%>
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/233999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6c6c9dfcb303d943023fdbb951680f4ff802b47
Gerrit-PatchSet: 2
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
