tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

expirer: fix prediction math, thanks to Zandr for the catch

This commit is contained in:
Brian Warner 2009-03-09 13:42:17 -07:00
parent 8708045a98
commit 1ccd426a34
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/allmydata/storage/expirer.py
View File

@ -354,7 +354,8 @@ class LeaseCheckingCrawler(ShareCrawler):
cycle = {"space-recovered": cycle_sr} cycle = {"space-recovered": cycle_sr}
if progress["cycle-complete-percentage"] > 0.0: if progress["cycle-complete-percentage"] > 0.0:
m = 100.0 / progress["cycle-complete-percentage"] pc = progress["cycle-complete-percentage"] / 100.0
m = (1-pc)/pc
for a in ("actual", "original-leasetimer", "configured-leasetimer"): for a in ("actual", "original-leasetimer", "configured-leasetimer"):
for b in ("numbuckets", "numshares", "sharebytes", "diskbytes"): for b in ("numbuckets", "numshares", "sharebytes", "diskbytes"):
k = a+"-"+b k = a+"-"+b

10
src/allmydata/test/test_storage.py
View File

@ -1812,15 +1812,15 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
def _check_html_in_cycle(html): def _check_html_in_cycle(html):
s = remove_tags(html) s = remove_tags(html)
# the first bucket encountered gets deleted, and its prefix # the first bucket encountered gets deleted, and its prefix
# happens to be about 1/6th of the way through the ring, so the # happens to be about 1/5th of the way through the ring, so the
# predictor thinks we'll have 6 shares and that we'll delete them # predictor thinks we'll have 5 shares and that we'll delete them
# all. This part of the test depends upon the SIs landing right # all. This part of the test depends upon the SIs landing right
# where they do now. # where they do now.
self.failUnlessIn("The remainder of this cycle is expected to " self.failUnlessIn("The remainder of this cycle is expected to "
"recover: 5 shares, 5 buckets", s) "recover: 4 shares, 4 buckets", s)
self.failUnlessIn("The whole cycle is expected to examine " self.failUnlessIn("The whole cycle is expected to examine "
"6 shares in 6 buckets and to recover: " "5 shares in 5 buckets and to recover: "
"6 shares, 6 buckets", s) "5 shares, 5 buckets", s)
d.addCallback(_check_html_in_cycle) d.addCallback(_check_html_in_cycle)
# wait for the crawler to finish the first cycle. Two shares should # wait for the crawler to finish the first cycle. Two shares should