From: Brian Warner <warner@allmydata.com>
Date: Fri, 27 Feb 2009 08:17:24 +0000 (-0700)
Subject: immutable checker add-lease: catch remote IndexError here too
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=400c04c19a27a96bb45cbe3f3ac0fe1ff2d4a6e2;p=tahoe-lafs%2Ftahoe-lafs.git

immutable checker add-lease: catch remote IndexError here too
---

diff --git a/src/allmydata/immutable/checker.py b/src/allmydata/immutable/checker.py
index 74343639..bbcd2ee9 100644
--- a/src/allmydata/immutable/checker.py
+++ b/src/allmydata/immutable/checker.py
@@ -80,12 +80,12 @@ class Checker(log.PrefixingLogMixin):
             cancel_secret = self._get_cancel_secret(serverid)
             d2 = server.callRemote("add_lease", storageindex,
                                    renew_secret, cancel_secret)
-            dl = defer.DeferredList([d, d2])
+            dl = defer.DeferredList([d, d2], consumeErrors=True)
             def _done(res):
                 [(get_success, get_result),
                  (addlease_success, addlease_result)] = res
                 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,
                     # which we ignore. But report others, including the
                     # unfortunate internal KeyError bug that <1.3.0 had.