ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/325946 )
Change subject: remove halt, last reference to forcenormal configuration
settings
......................................................................
remove halt, last reference to forcenormal configuration settings
We've not used the 'halt' config setting in several years; there
are other ways to notify the worker processes to exit between
jobs.
The --force-normal option was removed along with the dependency on
the utf8 normalization php extension over a year ago.
Change-Id: I6bd19dc79570c69495c9e6571ea3985945093ce5
---
M xmldumps-backup/dumps/WikiDump.py
M xmldumps-backup/worker.py
2 files changed, 0 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/46/325946/1
diff --git a/xmldumps-backup/dumps/WikiDump.py
b/xmldumps-backup/dumps/WikiDump.py
index 6635fb9..7a3e2d1 100644
--- a/xmldumps-backup/dumps/WikiDump.py
+++ b/xmldumps-backup/dumps/WikiDump.py
@@ -37,8 +37,6 @@
"closedlist": "",
"tablejobs": "",
# "dir": "",
- "forcenormal": "0",
- "halt": "0",
"skipdblist": "",
# "output": {
"public": "/dumps/public",
@@ -201,7 +199,6 @@
self.private_list = MiscUtils.db_list(self.conf.get("wiki",
"privatelist"))
self.closed_list = MiscUtils.db_list(self.conf.get("wiki",
"closedlist"))
self.flow_list = MiscUtils.db_list(self.conf.get("wiki", "flowlist"))
- self.halt = self.conf.getint("wiki", "halt")
self.tablejobs = self.conf.get("wiki", "tablejobs")
self.db_list = list(set(self.db_list) - set(self.skip_db_list))
diff --git a/xmldumps-backup/worker.py b/xmldumps-backup/worker.py
index a72d3b5..0dd4a59 100644
--- a/xmldumps-backup/worker.py
+++ b/xmldumps-backup/worker.py
@@ -90,10 +90,6 @@
date=None, job=None, skipjobs=None, page_id_range=None,
partnum_todo=None, checkpoint_file=None,
skipdone=False, restart=False,
verbose=False):
- if config.halt:
- sys.stderr.write("Dump process halted by config.\n")
- return None
-
nextdbs = config.db_list_by_age(bystatustime)
nextdbs.reverse()
--
To view, visit https://gerrit.wikimedia.org/r/325946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bd19dc79570c69495c9e6571ea3985945093ce5
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
