ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-10 23:12:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

immutable/checker.py: rearrange code a little bit, make it easier to follow

Browse Source
This commit is contained in:
Brian Warner 2009-10-05 13:02:52 -07:00
parent 9dba4ec641
commit be95129833
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/allmydata/immutable/checker.py
View File

@ -1,6 +1,6 @@
from foolscap.api import DeadReferenceError, RemoteException from foolscap.api import DeadReferenceError, RemoteException
from twisted.internet import defer from twisted.internet import defer
from allmydata import hashtree from allmydata.hashtree import IncompleteHashTree
from allmydata.check_results import CheckResults from allmydata.check_results import CheckResults
from allmydata.immutable import download from allmydata.immutable import download
from allmydata.uri import CHKFileVerifierURI from allmydata.uri import CHKFileVerifierURI
@ -132,34 +132,20 @@ class Checker(log.PrefixingLogMixin):
it will not errback -- it will fire normally with the indicated it will not errback -- it will fire normally with the indicated
results.""" results."""
b = layout.ReadBucketProxy(bucket, serverid, self._verifycap.storage_index) vcap = self._verifycap
veup = download.ValidatedExtendedURIProxy(b, self._verifycap) b = layout.ReadBucketProxy(bucket, serverid, vcap.storage_index)
veup = download.ValidatedExtendedURIProxy(b, vcap)
d = veup.start() d = veup.start()
def _errb(f):
# We didn't succeed at fetching and verifying all the blocks of
# this share. Handle each reason for failure differently.
if f.check(DeadReferenceError):
return (False, sharenum, 'disconnect')
elif f.check(RemoteException):
return (False, sharenum, 'failure')
elif f.check(layout.ShareVersionIncompatible):
return (False, sharenum, 'incompatible')
elif f.check(layout.LayoutInvalid,
layout.RidiculouslyLargeURIExtensionBlock,
download.BadOrMissingHash,
download.BadURIExtensionHashValue):
return (False, sharenum, 'corrupt')
# if it wasn't one of those reasons, re-raise the error
return f
def _got_ueb(vup): def _got_ueb(vup):
self._share_hash_tree = hashtree.IncompleteHashTree(self._verifycap.total_shares) self._share_hash_tree = IncompleteHashTree(vcap.total_shares)
self._share_hash_tree.set_hashes({0: vup.share_root_hash}) self._share_hash_tree.set_hashes({0: vup.share_root_hash})
vrbp = download.ValidatedReadBucketProxy(sharenum, b, self._share_hash_tree, vup.num_segments, vup.block_size, vup.share_size) vrbp = download.ValidatedReadBucketProxy(sharenum, b,
self._share_hash_tree,
vup.num_segments,
vup.block_size,
vup.share_size)
ds = [] ds = []
for blocknum in range(vup.num_segments): for blocknum in range(vup.num_segments):
@ -180,8 +166,26 @@ class Checker(log.PrefixingLogMixin):
dl.addCallback(_cb) dl.addCallback(_cb)
return dl return dl
d.addCallback(_got_ueb) d.addCallback(_got_ueb)
def _errb(f):
# We didn't succeed at fetching and verifying all the blocks of
# this share. Handle each reason for failure differently.
if f.check(DeadReferenceError):
return (False, sharenum, 'disconnect')
elif f.check(RemoteException):
return (False, sharenum, 'failure')
elif f.check(layout.ShareVersionIncompatible):
return (False, sharenum, 'incompatible')
elif f.check(layout.LayoutInvalid,
layout.RidiculouslyLargeURIExtensionBlock,
download.BadOrMissingHash,
download.BadURIExtensionHashValue):
return (False, sharenum, 'corrupt')
# if it wasn't one of those reasons, re-raise the error
return f
d.addErrback(_errb) d.addErrback(_errb)
return d return d