From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 21 Feb 2013 01:59:48 +0000 (+0000)
Subject: accounting_crawler.py: disable removing leasedb entries for disappeared shares.
X-Git-Url: https://git.rkrishnan.org/uri//%22%22?a=commitdiff_plain;h=070d2e6824de7fbcb9c891a7053a32b70cf6b69f;p=tahoe-lafs%2Ftahoe-lafs.git

accounting_crawler.py: disable removing leasedb entries for disappeared shares.
This works around ticket #1921 for now.

Signed-off-by: David-Sarah Hopwood <david-sarah@jacaranda.org>
---

diff --git a/src/allmydata/storage/accounting_crawler.py b/src/allmydata/storage/accounting_crawler.py
index 1adc9dba..d54f6133 100644
--- a/src/allmydata/storage/accounting_crawler.py
+++ b/src/allmydata/storage/accounting_crawler.py
@@ -106,7 +106,9 @@ class AccountingCrawler(ShareCrawler):
             for (si_s, shnum) in disappeared_shares:
                 log.msg(format="share SI=%(si_s)s shnum=%(shnum)s unexpectedly disappeared",
                         si_s=si_s, shnum=shnum, level=log.WEIRD)
-                self._leasedb.remove_deleted_share(si_a2b(si_s), shnum)
+                # This is temporarily disabled, because it results in failures if we're examining
+                # a prefix while a share is created in it (ticket #1921).
+                #self._leasedb.remove_deleted_share(si_a2b(si_s), shnum)
 
             recovered_sharesets = [set() for st in xrange(len(SHARETYPES))]