ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338728 )
Change subject: fix prefetch setup for retries of content file dump steps
......................................................................
fix prefetch setup for retries of content file dump steps
with checkpoint files enabled, the temp file to be written for a
retry, covering only partial page ranges, does not have leading
zeros for the page ids in the file name, the prefetch files will.
this means the comparison between values was broken, resulting
in no prefetch for this specific case.
Change-Id: Iaf02f9ae772d91dc46c39fa66b8c6c5ab54ab9a1
---
M xmldumps-backup/dumps/xmljobs.py
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/28/338728/1
diff --git a/xmldumps-backup/dumps/xmljobs.py b/xmldumps-backup/dumps/xmljobs.py
index 2254fdc..c6254ec 100644
--- a/xmldumps-backup/dumps/xmljobs.py
+++ b/xmldumps-backup/dumps/xmljobs.py
@@ -371,16 +371,16 @@
# one or both end values are missing:
if not fobj.last_page_id and not chkpt_fobj.last_page_id:
return True
- elif not fobj.last_page_id and chkpt_fobj.last_page_id <
fobj.first_page_id:
+ elif not fobj.last_page_id and int(chkpt_fobj.first_page_id) <
int(fobj.first_page_id):
return True
- elif not chkpt_fobj.last_page_id and fobj.last_page_id <
chkpt_fobj.first_page_id:
+ elif not chkpt_fobj.last_page_id and int(fobj.last_page_id) <
int(chkpt_fobj.first_page_id):
return True
# have end values for both files:
- elif (fobj.first_page_id <= chkpt_fobj.first_page_id and
- chkpt_fobj.first_page_id <= fobj.last_page_id):
+ elif (int(fobj.first_page_id) <= int(chkpt_fobj.first_page_id) and
+ int(chkpt_fobj.first_page_id) <= int(fobj.last_page_id)):
return True
- elif (chkpt_fobj.first_page_id <= fobj.first_page_id and
- fobj.first_page_id <= chkpt_fobj.last_page_id):
+ elif (int(chkpt_fobj.first_page_id) <= int(fobj.first_page_id) and
+ int(fobj.first_page_id) <= int(chkpt_fobj.last_page_id)):
return True
else:
return False
@@ -443,7 +443,6 @@
outfiles = self.get_reg_files_for_filepart_possible(
runner.dump_dir, self.get_fileparts_list(),
self.list_dumpnames())
if self._checkpoints_enabled:
-
# get the stub list that would be used for the current run
stubs = self.get_stub_files(runner)
stubs = sorted(stubs, key=lambda thing: thing.filename)
@@ -498,6 +497,7 @@
partial_stubs = []
if self.verbose:
print "todo is", [to.filename for to in todo]
+
for fileobj in todo:
stub_for_file = self.get_stub_files(runner, fileobj.partnum_int)[0]
--
To view, visit https://gerrit.wikimedia.org/r/338728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf02f9ae772d91dc46c39fa66b8c6c5ab54ab9a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
