ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345961 )
Change subject: convert RunInfoFile to RunInfo for class, methods, attrs ...................................................................... convert RunInfoFile to RunInfo for class, methods, attrs Change-Id: I056944d807bea98523178dc5e35cc7a4796257d8 --- M xmldumps-backup/dumpadmin.py M xmldumps-backup/dumps/jobs.py M xmldumps-backup/dumps/runner.py M xmldumps-backup/dumps/runnerutils.py M xmldumps-backup/dumps/runstatusapi.py M xmldumps-backup/dumps/xmljobs.py M xmldumps-backup/worker.py 7 files changed, 29 insertions(+), 29 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/xmldumps-backup/dumpadmin.py b/xmldumps-backup/dumpadmin.py index c6245e2..05ffa15 100644 --- a/xmldumps-backup/dumpadmin.py +++ b/xmldumps-backup/dumpadmin.py @@ -11,7 +11,7 @@ import socket import signal import traceback -from dumps.runnerutils import NoticeFile, RunInfoFile +from dumps.runnerutils import NoticeFile, RunInfo from dumps.fileutils import DumpDir from dumps.runner import Runner from dumps.WikiDump import Wiki, Config, Locker @@ -318,8 +318,8 @@ return [], None wiki.set_date(date) - run_info_file = RunInfoFile(wiki, False) - results = run_info_file.get_old_runinfo_from_file() + run_info = RunInfo(wiki, False) + results = run_info.get_old_runinfo_from_file() if not results: return [], None diff --git a/xmldumps-backup/dumps/jobs.py b/xmldumps-backup/dumps/jobs.py index f59609b..a5f1cb8 100644 --- a/xmldumps-backup/dumps/jobs.py +++ b/xmldumps-backup/dumps/jobs.py @@ -213,8 +213,8 @@ self.progress = line.strip() runner.report.update_index_html_and_json() runner.statushtml.update_status_file() - runner.dumpjobdata.runinfofile.save_dump_runinfo_file( - runner.dumpjobdata.runinfofile.report_dump_runinfo(runner.dump_item_list.dump_items)) + runner.dumpjobdata.runinfo.save_dump_runinfo( + runner.dumpjobdata.runinfo.report_dump_runinfo(runner.dump_item_list.dump_items)) def time_to_wait(self): # we use wait this many secs for a command to complete that diff --git a/xmldumps-backup/dumps/runner.py b/xmldumps-backup/dumps/runner.py index 961140a..58ae57c 100644 --- a/xmldumps-backup/dumps/runner.py +++ b/xmldumps-backup/dumps/runner.py @@ -20,7 +20,7 @@ from dumps.runnerutils import RunSettings, SymLinks, Feeds, NoticeFile from dumps.runnerutils import Checksummer, Report, StatusHtml, FailureHandler -from dumps.runnerutils import Maintenance, RunInfoFile, DumpRunJobData +from dumps.runnerutils import Maintenance, RunInfo, DumpRunJobData from dumps.utils import DbServerInfo, FilePartInfo, TimeUtils from dumps.runstatusapi import StatusAPI @@ -333,7 +333,7 @@ "Useful for offline readers, or for parallel processing of pages.", self.find_item_by_name(input_for_multistream), self.wiki, None)) - results = self.dumpjobdata.runinfofile.get_old_runinfo_from_file() + results = self.dumpjobdata.runinfo.get_old_runinfo_from_file() if results: for runinfo_entry in results: self._set_dump_item_runinfo(runinfo_entry) @@ -477,7 +477,7 @@ if self.enabled is None: self.enabled = {} for setting in [StatusHtml.NAME, Report.NAME, Checksummer.NAME, - RunInfoFile.NAME, SymLinks.NAME, RunSettings.NAME, + RunInfo.NAME, SymLinks.NAME, RunSettings.NAME, Feeds.NAME, NoticeFile.NAME, StatusAPI.NAME, "makedir", "clean_old_dumps", "cleanup_old_files", "check_trunc_files", "cleanup_tmp_files"]: @@ -489,7 +489,7 @@ if self.dryrun or self._partnum_todo is not None or self.checkpoint_file is not None: for setting in [StatusHtml.NAME, Report.NAME, Checksummer.NAME, - StatusAPI.NAME, RunInfoFile.NAME, SymLinks.NAME, RunSettings.NAME, + StatusAPI.NAME, RunInfo.NAME, SymLinks.NAME, RunSettings.NAME, Feeds.NAME, NoticeFile.NAME, "makedir", "clean_old_dumps"]: if setting in self.enabled: del self.enabled[setting] @@ -504,7 +504,7 @@ self.job_requested = job if self.job_requested == "latestlinks": - for setting in [StatusHtml.NAME, Report.NAME, RunInfoFile.NAME]: + for setting in [StatusHtml.NAME, Report.NAME, RunInfo.NAME]: if setting in self.enabled: del self.enabled[setting] diff --git a/xmldumps-backup/dumps/runnerutils.py b/xmldumps-backup/dumps/runnerutils.py index e1880ce..cdbf0c8 100644 --- a/xmldumps-backup/dumps/runnerutils.py +++ b/xmldumps-backup/dumps/runnerutils.py @@ -830,7 +830,7 @@ self.settings_stash.apply_settings_to_config() # now we can set up everything else - self.runinfofile = RunInfoFile(wiki, enabled, verbose) + self.runinfo = RunInfo(wiki, enabled, verbose) self.checksummer = Checksummer(wiki, dump_dir, enabled, verbose) self.feeds = Feeds(wiki, dump_dir, wiki.db_name, debugfn, enabled) self.symlinks = SymLinks(wiki, dump_dir, logfn, debugfn, enabled) @@ -852,7 +852,7 @@ self.symlinks.save_symlink(dumpfile) self.symlinks.cleanup_symlinks() for item in dump_items: - self.runinfofile.save_dump_runinfo_file(RunInfoFile.report_dump_runinfo(dump_items)) + self.runinfo.save_dump_runinfo(RunInfo.report_dump_runinfo(dump_items)) if item.to_run(): dump_names = item.list_dumpnames() if type(dump_names).__name__ != 'list': @@ -882,8 +882,8 @@ self.feeds.cleanup_feeds() def do_before_job(self, dump_items): - self.runinfofile.save_dump_runinfo_file( - RunInfoFile.report_dump_runinfo(dump_items)) + self.runinfo.save_dump_runinfo( + RunInfo.report_dump_runinfo(dump_items)) def do_after_job(self, item, dump_items): self.checksummer.cp_chksum_tmpfiles_to_permfile() @@ -898,16 +898,16 @@ self.checksummer.checksums(file_obj, self) self.symlinks.cleanup_symlinks() self.feeds.cleanup_feeds() - self.runinfofile.save_dump_runinfo_file( - RunInfoFile.report_dump_runinfo(dump_items)) + self.runinfo.save_dump_runinfo( + RunInfo.report_dump_runinfo(dump_items)) def do_latest_job(self): self.symlinks.remove_symlinks_from_old_runs(self.wiki.date) self.feeds.cleanup_feeds() -class RunInfoFile(object): - NAME = "runinfofile" +class RunInfo(object): + NAME = "runinfo" FORMATS = ['text', 'json'] @staticmethod @@ -960,11 +960,11 @@ self._enabled = enabled self.verbose = verbose - def save_dump_runinfo_file(self, content): + def save_dump_runinfo(self, content): """Write out a simple text file with the status for this wiki's dump.""" - if RunInfoFile.NAME in self._enabled: + if RunInfo.NAME in self._enabled: try: - self._write_dump_runinfo_file(content) + self._write_dump_runinfo(content) except Exception as ex: if self.verbose: exc_type, exc_value, exc_traceback = sys.exc_info() @@ -1047,8 +1047,8 @@ dump_runinfo[fieldname] = field_value return dump_runinfo - def _write_dump_runinfo_file(self, content): - for fmt in RunInfoFile.FORMATS: + def _write_dump_runinfo(self, content): + for fmt in RunInfo.FORMATS: dump_runinfo_filename = self._get_dump_runinfo_filename(fmt=fmt) # FileUtils.write_file(directory, dumpRunInfoFilename, text, # self.wiki.config.fileperms) diff --git a/xmldumps-backup/dumps/runstatusapi.py b/xmldumps-backup/dumps/runstatusapi.py index d86cd29..6818e55 100644 --- a/xmldumps-backup/dumps/runstatusapi.py +++ b/xmldumps-backup/dumps/runstatusapi.py @@ -10,7 +10,7 @@ import traceback import json from dumps.runnerutils import Checksummer -from dumps.runnerutils import RunInfoFile +from dumps.runnerutils import RunInfo from dumps.runnerutils import Report from dumps.fileutils import DumpFilename from dumps.fileutils import DumpDir @@ -134,9 +134,9 @@ if filehashinfo is None: filehashinfo = [Checksummer.get_empty_json()] if dumpruninfo is None: - dumpruninfo = RunInfoFile.get_empty_json() + dumpruninfo = RunInfo.get_empty_json() if reportinfo is not None: - dumpruninfo_jobs = RunInfoFile.get_jobs(dumpruninfo) + dumpruninfo_jobs = RunInfo.get_jobs(dumpruninfo) for jobname in Report.get_jobs(reportinfo): if jobname in dumpruninfo_jobs: # fold hash info into the report @@ -144,7 +144,7 @@ # fold the report info (file info for all job-related files) # into the dumpruninfo fileinfo = Report.get_fileinfo_for_job(jobname, reportinfo) - RunInfoFile.add_job_property(jobname, "files", fileinfo, dumpruninfo) + RunInfo.add_job_property(jobname, "files", fileinfo, dumpruninfo) return dumpruninfo def write_contents_json(self, contents): diff --git a/xmldumps-backup/dumps/xmljobs.py b/xmldumps-backup/dumps/xmljobs.py index 9d551ce..342aa90 100644 --- a/xmldumps-backup/dumps/xmljobs.py +++ b/xmldumps-backup/dumps/xmljobs.py @@ -860,7 +860,7 @@ continue # see if this job from that date was successful - if not runner.dumpjobdata.runinfofile.status_of_old_dump_is_done( + if not runner.dumpjobdata.runinfo.status_of_old_dump_is_done( runner, date, self.name(), self._desc): runner.debug("skipping incomplete or failed dump for prefetch date %s" % date) continue diff --git a/xmldumps-backup/worker.py b/xmldumps-backup/worker.py index 0dd4a59..507de7c 100644 --- a/xmldumps-backup/worker.py +++ b/xmldumps-backup/worker.py @@ -49,7 +49,7 @@ # failed to get the run's info so let's call it 'didn't run' return False - results = runner.dumpjobdata.runinfofile.get_old_runinfo_from_file() + results = runner.dumpjobdata.runinfo.get_old_runinfo_from_file() if results: for runinfo_obj in results: runner.dump_item_list._set_dump_item_runinfo(runinfo_obj) -- To view, visit https://gerrit.wikimedia.org/r/345961 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I056944d807bea98523178dc5e35cc7a4796257d8 Gerrit-PatchSet: 1 Gerrit-Project: operations/dumps Gerrit-Branch: master Gerrit-Owner: ArielGlenn <ar...@wikimedia.org> Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits