ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-25 07:31:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

immutable checker add-lease: catch remote IndexError here too

Browse Source
This commit is contained in:
Brian Warner 2009-02-27 01:17:24 -07:00
parent 99ebf6eaf5
commit 400c04c19a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,12 +80,12 @@ class Checker(log.PrefixingLogMixin):
cancel_secret = self._get_cancel_secret(serverid) cancel_secret = self._get_cancel_secret(serverid)
d2 = server.callRemote("add_lease", storageindex, d2 = server.callRemote("add_lease", storageindex,
renew_secret, cancel_secret) renew_secret, cancel_secret)
dl = defer.DeferredList([d, d2]) dl = defer.DeferredList([d, d2], consumeErrors=True)
def _done(res): def _done(res):
[(get_success, get_result), [(get_success, get_result),
(addlease_success, addlease_result)] = res (addlease_success, addlease_result)] = res
if (not addlease_success and if (not addlease_success and
not addlease_result.check(IndexError)): not rrefutil.check_remote(addlease_result, IndexError)):
# tahoe=1.3.0 raised IndexError on non-existant buckets, # tahoe=1.3.0 raised IndexError on non-existant buckets,
# which we ignore. But report others, including the # which we ignore. But report others, including the
# unfortunate internal KeyError bug that <1.3.0 had. # unfortunate internal KeyError bug that <1.3.0 had.