ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347182 )
Change subject: fix bug that produced badly named page range files
......................................................................
fix bug that produced badly named page range files
contents of these files were fine, but the first one in a series
for a given subjob might have the wrong start page id in the filename,
although the actual contents correspond to the correctly generated
stub file
Change-Id: I76a5556f414de3860314c9b79cadc795b0000b4a
---
M xmldumps-backup/dumps/pagerange.py
1 file changed, 1 insertion(+), 13 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/xmldumps-backup/dumps/pagerange.py
b/xmldumps-backup/dumps/pagerange.py
index 6e20b89..56e6da6 100644
--- a/xmldumps-backup/dumps/pagerange.py
+++ b/xmldumps-backup/dumps/pagerange.py
@@ -164,11 +164,6 @@
# last job, don't bother searching. just append up to max page
id
ranges.append((page_start, self.total_pages))
break
- # this is wrong too, we need to get it passed or something
-# prevguess = min(interval*(jobnum+1), self.total_pages)
- # fixme here the interval*jobnum can't be right
-# (start, end) = self.get_pagerange(page_start, numrevs,
-# interval*jobnum, prevguess)
numjobs_left = numjobs - jobnum + 1
interval = ((self.total_pages - page_start) / numjobs_left) + 1
(start, end) = self.get_pagerange(page_start, numrevs,
@@ -201,9 +196,7 @@
page_start = 1
if not page_end:
page_end = self.total_pages
- # actually this is ok for the start but it varies right afterwards
- # interval = ((self.total_pages - page_start)/numjobs_left) + 1
- prevguess = 0
+ prevguess = page_start
if page_start == 1 and page_end == self.total_pages:
numjobs = self.total_revs / numrevs + 1
else:
@@ -215,11 +208,6 @@
# last job, don't bother searching. just append up to max page
id
ranges.append((str(page_start), str(page_end)))
break
- # this is wrong too, we need to get it passed or something
-# prevguess = min(interval*(jobnum+1), self.total_pages)
- # fixme here the interval*jobnum can't be right
-# (start, end) = self.get_pagerange(page_start, numrevs,
-# interval*jobnum, prevguess)
numjobs_left = numjobs - jobnum + 1
interval = (page_end - page_start) / numjobs_left + 1
(start, end) = self.get_pagerange(page_start, numrevs,
--
To view, visit https://gerrit.wikimedia.org/r/347182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76a5556f414de3860314c9b79cadc795b0000b4a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
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
