[MediaWiki-commits] [Gerrit] fix up a couple stray camelcases in Runner attributes - change (operations/dumps)
ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/242485
Change subject: fix up a couple stray camelcases in Runner attributes
..
fix up a couple stray camelcases in Runner attributes
Change-Id: I43a43706957b0a97aa568c6b84d54d475388a98e
---
M xmldumps-backup/dumps/jobs.py
M xmldumps-backup/dumps/utils.py
M xmldumps-backup/worker.py
3 files changed, 24 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/85/242485/1
diff --git a/xmldumps-backup/dumps/jobs.py b/xmldumps-backup/dumps/jobs.py
index 84c4303..4f42892 100644
--- a/xmldumps-backup/dumps/jobs.py
+++ b/xmldumps-backup/dumps/jobs.py
@@ -648,7 +648,7 @@
"""Dump a table from the current DB with mysqldump, save to a gzipped
sql file."""
if not exists(runner.wiki.config.gzip):
raise BackupError("gzip command %s not found" %
runner.wiki.config.gzip)
-commands = runner.dbServerInfo.build_sqldump_command(table,
runner.wiki.config.gzip)
+commands = runner.db_server_info.build_sqldump_command(table,
runner.wiki.config.gzip)
return runner.save_command(commands, outfile)
class PrivateTable(PublicTable):
@@ -1881,7 +1881,7 @@
"""Pass some SQL commands to the server for this DB and save output to
a gzipped file."""
if not exists(runner.wiki.config.gzip):
raise BackupError("gzip command %s not found" %
runner.wiki.config.gzip)
-command = runner.dbServerInfo.buildSqlCommand(query,
runner.wiki.config.gzip)
+command = runner.db_server_info.buildSqlCommand(query,
runner.wiki.config.gzip)
return runner.save_command(command, outfile)
class AllTitleDump(TitleDump):
diff --git a/xmldumps-backup/dumps/utils.py b/xmldumps-backup/dumps/utils.py
index 96fd489..9bab8cc 100644
--- a/xmldumps-backup/dumps/utils.py
+++ b/xmldumps-backup/dumps/utils.py
@@ -168,35 +168,35 @@
self.total_edits = None
self.wiki = wiki
self.dbName = db_name
-self.dbServerInfo = DbServerInfo(wiki, db_name, error_callback)
+self.db_server_info = DbServerInfo(wiki, db_name, error_callback)
self.get_statistics(self.wiki.config, db_name)
def get_statistics(self, db_name, ignore):
"""Get statistics for the wiki"""
-query = "select MAX(page_id) from %spage;" %
self.dbServerInfo.db_table_prefix
+query = "select MAX(page_id) from %spage;" %
self.db_server_info.db_table_prefix
results = None
retries = 0
maxretries = 5
-results = self.dbServerInfo.run_sql_and_get_output(query)
+results = self.db_server_info.run_sql_and_get_output(query)
while results == None and retries < maxretries:
retries = retries + 1
time.sleep(5)
-results = self.dbServerInfo.run_sql_and_get_output(query)
+results = self.db_server_info.run_sql_and_get_output(query)
if not results:
return 1
lines = results.splitlines()
if lines and lines[1]:
self.total_pages = int(lines[1])
-query = "select MAX(rev_id) from %srevision;" %
self.dbServerInfo.db_table_prefix
+query = "select MAX(rev_id) from %srevision;" %
self.db_server_info.db_table_prefix
retries = 0
results = None
-results = self.dbServerInfo.run_sql_and_get_output(query)
+results = self.db_server_info.run_sql_and_get_output(query)
while results == None and retries < maxretries:
retries = retries + 1
time.sleep(5)
-results = self.dbServerInfo.run_sql_and_get_output(query)
+results = self.db_server_info.run_sql_and_get_output(query)
if not results:
return 1
diff --git a/xmldumps-backup/worker.py b/xmldumps-backup/worker.py
index b2bdd41..893f535 100644
--- a/xmldumps-backup/worker.py
+++ b/xmldumps-backup/worker.py
@@ -337,10 +337,10 @@
class Runner(object):
def __init__(self, wiki, prefetch=True, spawn=True, job=None,
skip_jobs=None, restart=False, notice="", dryrun=False, loggingEnabled=False,
chunk_to_do=False, checkpoint_file=None, page_id_range=None, skipdone=False,
verbose=False):
self.wiki = wiki
-self.dbName = wiki.dbName
+self.db_name = wiki.dbName
self.prefetch = prefetch
self.spawn = spawn
-self.chunkInfo = Chunk(wiki, self.dbName, self.log_and_print)
+self.chunkInfo = Chunk(wiki, self.db_name, self.log_and_print)
self.restart = restart
self.html_notice_file = None
self.log = None
@@ -435,8 +435,8 @@
self._cleanup_old_files_enabled = False
self._check_for_trunc_files_enabled = False
-self.dbServerInfo = DbServerInfo(self.wiki, self.dbName,
self.log_and_print)
-self.dump_dir =
[MediaWiki-commits] [Gerrit] fix up a couple stray camelcases in Runner attributes - change (operations/dumps)
ArielGlenn has submitted this change and it was merged.
Change subject: fix up a couple stray camelcases in Runner attributes
..
fix up a couple stray camelcases in Runner attributes
Change-Id: I43a43706957b0a97aa568c6b84d54d475388a98e
---
M xmldumps-backup/dumps/jobs.py
M xmldumps-backup/dumps/utils.py
M xmldumps-backup/worker.py
3 files changed, 24 insertions(+), 24 deletions(-)
Approvals:
ArielGlenn: Verified; Looks good to me, approved
diff --git a/xmldumps-backup/dumps/jobs.py b/xmldumps-backup/dumps/jobs.py
index 84c4303..4f42892 100644
--- a/xmldumps-backup/dumps/jobs.py
+++ b/xmldumps-backup/dumps/jobs.py
@@ -648,7 +648,7 @@
"""Dump a table from the current DB with mysqldump, save to a gzipped
sql file."""
if not exists(runner.wiki.config.gzip):
raise BackupError("gzip command %s not found" %
runner.wiki.config.gzip)
-commands = runner.dbServerInfo.build_sqldump_command(table,
runner.wiki.config.gzip)
+commands = runner.db_server_info.build_sqldump_command(table,
runner.wiki.config.gzip)
return runner.save_command(commands, outfile)
class PrivateTable(PublicTable):
@@ -1881,7 +1881,7 @@
"""Pass some SQL commands to the server for this DB and save output to
a gzipped file."""
if not exists(runner.wiki.config.gzip):
raise BackupError("gzip command %s not found" %
runner.wiki.config.gzip)
-command = runner.dbServerInfo.buildSqlCommand(query,
runner.wiki.config.gzip)
+command = runner.db_server_info.buildSqlCommand(query,
runner.wiki.config.gzip)
return runner.save_command(command, outfile)
class AllTitleDump(TitleDump):
diff --git a/xmldumps-backup/dumps/utils.py b/xmldumps-backup/dumps/utils.py
index 96fd489..9bab8cc 100644
--- a/xmldumps-backup/dumps/utils.py
+++ b/xmldumps-backup/dumps/utils.py
@@ -168,35 +168,35 @@
self.total_edits = None
self.wiki = wiki
self.dbName = db_name
-self.dbServerInfo = DbServerInfo(wiki, db_name, error_callback)
+self.db_server_info = DbServerInfo(wiki, db_name, error_callback)
self.get_statistics(self.wiki.config, db_name)
def get_statistics(self, db_name, ignore):
"""Get statistics for the wiki"""
-query = "select MAX(page_id) from %spage;" %
self.dbServerInfo.db_table_prefix
+query = "select MAX(page_id) from %spage;" %
self.db_server_info.db_table_prefix
results = None
retries = 0
maxretries = 5
-results = self.dbServerInfo.run_sql_and_get_output(query)
+results = self.db_server_info.run_sql_and_get_output(query)
while results == None and retries < maxretries:
retries = retries + 1
time.sleep(5)
-results = self.dbServerInfo.run_sql_and_get_output(query)
+results = self.db_server_info.run_sql_and_get_output(query)
if not results:
return 1
lines = results.splitlines()
if lines and lines[1]:
self.total_pages = int(lines[1])
-query = "select MAX(rev_id) from %srevision;" %
self.dbServerInfo.db_table_prefix
+query = "select MAX(rev_id) from %srevision;" %
self.db_server_info.db_table_prefix
retries = 0
results = None
-results = self.dbServerInfo.run_sql_and_get_output(query)
+results = self.db_server_info.run_sql_and_get_output(query)
while results == None and retries < maxretries:
retries = retries + 1
time.sleep(5)
-results = self.dbServerInfo.run_sql_and_get_output(query)
+results = self.db_server_info.run_sql_and_get_output(query)
if not results:
return 1
diff --git a/xmldumps-backup/worker.py b/xmldumps-backup/worker.py
index b2bdd41..893f535 100644
--- a/xmldumps-backup/worker.py
+++ b/xmldumps-backup/worker.py
@@ -337,10 +337,10 @@
class Runner(object):
def __init__(self, wiki, prefetch=True, spawn=True, job=None,
skip_jobs=None, restart=False, notice="", dryrun=False, loggingEnabled=False,
chunk_to_do=False, checkpoint_file=None, page_id_range=None, skipdone=False,
verbose=False):
self.wiki = wiki
-self.dbName = wiki.dbName
+self.db_name = wiki.dbName
self.prefetch = prefetch
self.spawn = spawn
-self.chunkInfo = Chunk(wiki, self.dbName, self.log_and_print)
+self.chunkInfo = Chunk(wiki, self.db_name, self.log_and_print)
self.restart = restart
self.html_notice_file = None
self.log = None
@@ -435,8 +435,8 @@
self._cleanup_old_files_enabled = False
self._check_for_trunc_files_enabled = False
-self.dbServerInfo = DbServerInfo(self.wiki, self.dbName,
self.log_and_print)
-self.dump_dir = DumpDir(self.wiki, self.dbName)
+self.db_server_info =
