From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Fri, 13 Feb 2009 00:04:47 +0000 (-0700)
Subject: immutable repairer: fix DownUpConnector so that it satisfies short reads the were... 
X-Git-Tag: allmydata-tahoe-1.3.0~17
X-Git-Url: https://git.rkrishnan.org/pf/content/de.html?a=commitdiff_plain;h=d7dbd6675efa2f25c5ff54390a848bc360e23e87;p=tahoe-lafs%2Ftahoe-lafs.git

immutable repairer: fix DownUpConnector so that it satisfies short reads the were requested after the last write and before the close
This is probably the cause of the very rare "loss of progress" bug.  This is tested by unit tests.  A recent patch changed this to errback instead of losing progress, and now this patch is changing it again to return a short read instead of errbacking.  Returning a short read is what the uploader (in encode.py) is expecting, when it is reading the last block of the ciphertext, which might be shorter than the other blocks.
---

diff --git a/src/allmydata/immutable/repairer.py b/src/allmydata/immutable/repairer.py
index 6f21da2e..d799c7dd 100644
--- a/src/allmydata/immutable/repairer.py
+++ b/src/allmydata/immutable/repairer.py
@@ -73,16 +73,6 @@ class Repairer(log.PrefixingLogMixin):
 
         return d
 
-class PrematureClose(Exception):
-    # Uploader asked DUC to read a certain number of bytes, and
-    # Downloader closed DUC before writing enough bytes to satisfy the
-    # read.
-    def __init__(self, requested, avail):
-        self.requested = requested
-        self.avail = avail
-    def __repr__(self):
-        return "<%s requested: %d, avail: %d>" % (self.__class__.__name__, self.requested, self.avail)
-
 class DownUpConnector(log.PrefixingLogMixin):
     implements(IEncryptedUploadable, IDownloadTarget, IConsumer)
     """ I act like an "encrypted uploadable" -- something that a local uploader can read
@@ -186,10 +176,9 @@ class DownUpConnector(log.PrefixingLogMixin):
         pass
     def close(self):
         self._closed_to_pusher = True
-        # Any reads which haven't been satisfied by now are not going to be satisfied.
-        while self.next_read_ds:
-            self.next_read_ds.popleft().errback(
-                PrematureClose(self.next_read_lens.popleft(), self.bufsiz))
+        # Any reads which haven't been satisfied by now are going to
+        # have to be satisfied with short reads.
+        self._satisfy_reads_if_possible()
 
     # methods to satisfy the IEncryptedUploader interface
     # (From the perspective of an uploader I am an IEncryptedUploadable.)