From: Brian Warner <warner@allmydata.com>
Date: Tue, 16 Jan 2007 22:15:26 +0000 (-0700)
Subject: change upload to push 2 shares instead of 3
X-Git-Tag: tahoe_v0.1.0-0-UNSTABLE~371
X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=8d4d2c82c45a479e84c8e74c5bd8926167cc9428;p=tahoe-lafs%2Ftahoe-lafs.git

change upload to push 2 shares instead of 3
Now that peers can talk to themselves, the 5-node system test won't fail
just because one of the shares was hosted on the downloader (and thus
inaccessible until recently). The 3-share push was there to avoid this
problem.
---

diff --git a/src/allmydata/upload.py b/src/allmydata/upload.py
index 5121bc93..653ada41 100644
--- a/src/allmydata/upload.py
+++ b/src/allmydata/upload.py
@@ -270,12 +270,9 @@ class Uploader(service.MultiService):
         if self.debug:
             u.debug = True
         u.set_filehandle(fh)
-        # TODO: change this to (2,2,4) once Foolscap is fixed to allow
-        # connect-to-self and Client is fixed to include ourselves in the
-        # peerlist. Otherwise this usually fails because we give a share to
-        # the eventual downloader, and they won't try to get a share from
-        # themselves.
-        u.set_params(2, 3, 4)
+        # push two shares, require that we get two back. TODO: this is
+        # temporary, of course.
+        u.set_params(2, 2, 4)
         u.set_verifierid(self._compute_verifierid(fh))
         d = u.start()
         def _done(res):