ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-20 17:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dirnode deep-check: rearrange traversal approach, simplify code a bit

Browse Source
This commit is contained in:
Brian Warner 2008-07-17 14:25:04 -07:00
parent 9289433ba3
commit acf3180fac
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/allmydata/dirnode.py
View File

@ -535,46 +535,42 @@ class NewDirectoryNode:
return d
def deep_check(self, verify=False, repair=False):
# shallow-check each object first, then traverse children
results = DeepCheckResults()
found = set()
found.add(self.get_verifier())
limiter = ConcurrencyLimiter(10)
d = self._add_check_from_node(self, results, limiter, verify, repair)
d.addCallback(lambda res:
self._add_deepcheck_from_dirnode(self,
found, results, limiter,
verify, repair))
d = self._add_deepcheck_from_node(self, results, found, limiter,
verify, repair)
d.addCallback(lambda res: results)
return d
def _add_check_from_node(self, node, results, limiter, verify, repair):
def _add_deepcheck_from_node(self, node, results, found, limiter,
verify, repair):
verifier = node.get_verifier()
if verifier in found:
# avoid loops
return None
found.add(verifier)
d = limiter.add(node.check, verify, repair)
d.addCallback(results.add_check)
if IDirectoryNode.providedBy(node):
d.addCallback(lambda res: node.list())
def _got_children(children):
dl = []
for name, (child, metadata) in children.iteritems():
d2 = self._add_deepcheck_from_node(child,
results, limiter,
verify, repair)
if d2:
dl.append(d1)
if dl:
return defer.DeferredList(dl)
d.addCallback(_got_children)
return d
def _add_deepcheck_from_dirnode(self, node, found, results, limiter,
verify, repair):
d = limiter.add(node.list)
def _got_list(children):
dl = []
for name, (child, metadata) in children.iteritems():
verifier = child.get_verifier()
if verifier in found:
# avoid loops
continue
dl.append(self._add_check_from_node(child,
results, limiter,
verify, repair))
if IDirectoryNode.providedBy(child):
dl.append(self._add_deepcheck_from_node(child, found,
results, limiter,
verify, repair))
if dl:
return defer.DeferredList(dl)
d.addCallback(_got_list)
return d
class DeepStats:
def __init__(self):