Ticket #1465: newseries_peripherals_20110810.darcs.patch

File newseries_peripherals_20110810.darcs.patch, 60.4 KB (added by Zancas, at 2011-08-10T22:10:44Z)

makes changes in storage/common.py, backends/base.py, and allmydata/interfaces.py changes are minimal for passage of "null" test_write_share

Line 
1Wed Aug 10 14:53:05 MDT 2011  wilcoxjg@gmail.com
2  * test_backends.py: The file is added to the repository.  All incorporated tests fail.
3      This test_suite implements mockery based tests of StorageServer.
4        The system under test includes code that has been moved from storage/server.py,
5      and storage/immutable.py to newly created modules in the new subdirectory
6      "backends/"<BACKENDTYPE> there are currently two types:  "null", and "Disk". Of
7      course, these directories do not exist in this patch, so the initial test reports
8      an ImportError.
9
10Wed Aug 10 15:09:44 MDT 2011  wilcoxjg@gmail.com
11  * backends:  Adds directory backends and minimal children e.g. __init__.py(s).
12   The patch-set adds code in order; such that first the smallest system-under-test
13  passes, then larger systems (in their own test methods) are exercised/tested. This
14  patch adds a minimal directory/file structure under "backends" such that import
15  calls in test_backends do not raise exceptions; while the simpler tests, that do not
16  depend on all of the backend code, are run.
17
18Wed Aug 10 15:26:19 MDT 2011  wilcoxjg@gmail.com
19  * disk/core.py: Contains dummy class to permit null tests
20
21Wed Aug 10 15:27:54 MDT 2011  wilcoxjg@gmail.com
22  * backend/null/core.py: Basic functionality of null for server tests.
23
24Wed Aug 10 15:31:55 MDT 2011  wilcoxjg@gmail.com
25  * backends/base.py: The addition of this file gives backend core objects access to their twisted.application.service superclass.
26
27Wed Aug 10 15:36:53 MDT 2011  wilcoxjg@gmail.com
28  * allmydata/interfaces.py: Add interfaces for IStorageBackend and IStorageBackendShare
29    All core objects in storage backends will implement IStorageBackend, likewise
30  IStorageBackendShare will be implemented by ImmutableShare objects that live on the
31  backends.
32    These interface definitions are skeletal at this stage because the interfaces
33  for these objects will mature with incorporation of new backend types.
34
35Wed Aug 10 16:00:50 MDT 2011  wilcoxjg@gmail.com
36  * storage/common.py: add stub si_si2dir method. This will be completed for tests that exercise the Disk backend.
37
38New patches:
39
40[test_backends.py: The file is added to the repository.  All incorporated tests fail.
41wilcoxjg@gmail.com**20110810205305
42 Ignore-this: d9ed05618509d6cf62e9537affa9bae6
43     This test_suite implements mockery based tests of StorageServer.
44       The system under test includes code that has been moved from storage/server.py,
45     and storage/immutable.py to newly created modules in the new subdirectory
46     "backends/"<BACKENDTYPE> there are currently two types:  "null", and "Disk". Of
47     course, these directories do not exist in this patch, so the initial test reports
48     an ImportError.
49] {
50addfile ./src/allmydata/test/test_backends.py
51hunk ./src/allmydata/test/test_backends.py 1
52+import os, stat
53+from twisted.trial import unittest
54+from allmydata.util.log import msg
55+from allmydata.test.common_util import ReallyEqualMixin
56+import mock
57+# This is the code that we're going to be testing.
58+from allmydata.storage.server import StorageServer
59+from allmydata.storage.backends.disk.core import DiskCore
60+from allmydata.storage.backends.null.core import NullCore
61+from allmydata.storage.common import si_si2dir
62+# The following share file content was generated with
63+# storage.immutable.ShareFile from Tahoe-LAFS v1.8.2
64+# with share data == 'a'. The total size of this input
65+# is 85 bytes.
66+shareversionnumber = '\x00\x00\x00\x01'
67+sharedatalength = '\x00\x00\x00\x01'
68+numberofleases = '\x00\x00\x00\x01'
69+shareinputdata = 'a'
70+ownernumber = '\x00\x00\x00\x00'
71+renewsecret  = 'x'*32
72+cancelsecret = 'y'*32
73+expirationtime = '\x00(\xde\x80'
74+nextlease = ''
75+containerdata = shareversionnumber + sharedatalength + numberofleases
76+client_data = shareinputdata + ownernumber + renewsecret + \
77+    cancelsecret + expirationtime + nextlease
78+share_data = containerdata + client_data
79+testnodeid = 'testnodeidxxxxxxxxxx'
80+expiration_policy = {'enabled' : False,
81+                     'mode' : 'age',
82+                     'override_lease_duration' : None,
83+                     'cutoff_date' : None,
84+                     'sharetypes' : None}
85+
86+
87+class MockFileSystem(unittest.TestCase):
88+    """ I simulate a filesystem that the code under test can use. I simulate
89+    just the parts of the filesystem that the current implementation of Disk
90+    backend needs. """
91+    def setUp(self):
92+        # Make patcher, patch, and make effects for fs using functions.
93+        msg( "%s.setUp()" % (self,))
94+        self.mockedfilepaths = {}
95+        #keys are pathnames, values are MockFilePath objects. This is necessary because
96+        #MockFilePath behavior sometimes depends on the filesystem. Where it does,
97+        #self.mockedfilepaths has the relevent info.
98+        self.storedir = MockFilePath('teststoredir', self.mockedfilepaths)
99+        self.basedir = self.storedir.child('shares')
100+        self.baseincdir = self.basedir.child('incoming')
101+        self.sharedirfinalname = self.basedir.child('or').child('orsxg5dtorxxeylhmvpws3temv4a')
102+        self.sharedirincomingname = self.baseincdir.child('or').child('orsxg5dtorxxeylhmvpws3temv4a')
103+        self.shareincomingname = self.sharedirincomingname.child('0')
104+        self.sharefinalname = self.sharedirfinalname.child('0')
105+
106+        self.FilePathFake = mock.patch('allmydata.storage.backends.disk.core.FilePath', new = MockFilePath )
107+        self.FilePathFake.__enter__()
108+
109+        self.BCountingCrawler = mock.patch('allmydata.storage.backends.disk.core.BucketCountingCrawler')
110+        FakeBCC = self.BCountingCrawler.__enter__()
111+        FakeBCC.side_effect = self.call_FakeBCC
112+
113+        self.LeaseCheckingCrawler = mock.patch('allmydata.storage.backends.disk.core.LeaseCheckingCrawler')
114+        FakeLCC = self.LeaseCheckingCrawler.__enter__()
115+        FakeLCC.side_effect = self.call_FakeLCC
116+
117+        self.get_available_space = mock.patch('allmydata.util.fileutil.get_available_space')
118+        GetSpace = self.get_available_space.__enter__()
119+        GetSpace.side_effect = self.call_get_available_space
120+
121+        self.statforsize = mock.patch('allmydata.storage.backends.disk.core.filepath.stat')
122+        getsize = self.statforsize.__enter__()
123+        getsize.side_effect = self.call_statforsize
124+
125+    def call_FakeBCC(self, StateFile):
126+        return MockBCC()
127+
128+    def call_FakeLCC(self, StateFile, HistoryFile, ExpirationPolicy):
129+        return MockLCC()
130+
131+    def call_get_available_space(self, storedir, reservedspace):
132+        # The input vector has an input size of 85.
133+        return 85 - reservedspace
134+
135+    def call_statforsize(self, fakefpname):
136+        return self.mockedfilepaths[fakefpname].fileobject.size()
137+
138+    def tearDown(self):
139+        msg( "%s.tearDown()" % (self,))
140+        self.FilePathFake.__exit__()
141+        self.mockedfilepaths = {}
142+
143+
144+class MockFilePath:
145+    def __init__(self, pathstring, ffpathsenvironment, existance=False):
146+        #  I can't jsut make the values MockFileObjects because they may be directories.
147+        self.mockedfilepaths = ffpathsenvironment
148+        self.path = pathstring
149+        self.existance = existance
150+        if not self.mockedfilepaths.has_key(self.path):
151+            #  The first MockFilePath object is special
152+            self.mockedfilepaths[self.path] = self
153+            self.fileobject = None
154+        else:
155+            self.fileobject = self.mockedfilepaths[self.path].fileobject
156+        self.spawn = {}
157+        self.antecedent = os.path.dirname(self.path)
158+
159+    def setContent(self, contentstring):
160+        # This method rewrites the data in the file that corresponds to its path
161+        # name whether it preexisted or not.
162+        self.fileobject = MockFileObject(contentstring)
163+        self.existance = True
164+        self.mockedfilepaths[self.path].fileobject = self.fileobject
165+        self.mockedfilepaths[self.path].existance = self.existance
166+        self.setparents()
167+
168+    def create(self):
169+        # This method chokes if there's a pre-existing file!
170+        if self.mockedfilepaths[self.path].fileobject:
171+            raise OSError
172+        else:
173+            self.existance = True
174+            self.mockedfilepaths[self.path].fileobject = self.fileobject
175+            self.mockedfilepaths[self.path].existance = self.existance
176+            self.setparents()
177+
178+    def open(self, mode='r'):
179+        # XXX Makes no use of mode.
180+        if not self.mockedfilepaths[self.path].fileobject:
181+            # If there's no fileobject there already then make one and put it there.
182+            self.fileobject = MockFileObject()
183+            self.existance = True
184+            self.mockedfilepaths[self.path].fileobject = self.fileobject
185+            self.mockedfilepaths[self.path].existance = self.existance
186+        else:
187+            # Otherwise get a ref to it.
188+            self.fileobject = self.mockedfilepaths[self.path].fileobject
189+            self.existance = self.mockedfilepaths[self.path].existance
190+        return self.fileobject.open(mode)
191+
192+    def child(self, childstring):
193+        arg2child = os.path.join(self.path, childstring)
194+        child = MockFilePath(arg2child, self.mockedfilepaths)
195+        return child
196+
197+    def children(self):
198+        childrenfromffs = [ffp for ffp in self.mockedfilepaths.values() if ffp.path.startswith(self.path)]
199+        childrenfromffs = [ffp for ffp in childrenfromffs if not ffp.path.endswith(self.path)]
200+        childrenfromffs = [ffp for ffp in childrenfromffs if ffp.exists()]
201+        self.spawn = frozenset(childrenfromffs)
202+        return self.spawn
203+
204+    def parent(self):
205+        if self.mockedfilepaths.has_key(self.antecedent):
206+            parent = self.mockedfilepaths[self.antecedent]
207+        else:
208+            parent = MockFilePath(self.antecedent, self.mockedfilepaths)
209+        return parent
210+
211+    def parents(self):
212+        antecedents = []
213+        def f(fps, antecedents):
214+            newfps = os.path.split(fps)[0]
215+            if newfps:
216+                antecedents.append(newfps)
217+                f(newfps, antecedents)
218+        f(self.path, antecedents)
219+        return antecedents
220+
221+    def setparents(self):
222+        for fps in self.parents():
223+            if not self.mockedfilepaths.has_key(fps):
224+                self.mockedfilepaths[fps] = MockFilePath(fps, self.mockedfilepaths, exists=True)
225+
226+    def basename(self):
227+        return os.path.split(self.path)[1]
228+
229+    def moveTo(self, newffp):
230+        #  XXX Makes no distinction between file and directory arguments, this is deviation from filepath.moveTo
231+        if self.mockedfilepaths[newffp.path].exists():
232+            raise OSError
233+        else:
234+            self.mockedfilepaths[newffp.path] = self
235+            self.path = newffp.path
236+
237+    def getsize(self):
238+        return self.fileobject.getsize()
239+
240+    def exists(self):
241+        return self.existance
242+
243+    def isdir(self):
244+        return True
245+
246+    def makedirs(self):
247+        # XXX These methods assume that fp_<FOO> functions in fileutil will be tested elsewhere!
248+        pass
249+
250+    def remove(self):
251+        pass
252+
253+
254+class MockFileObject:
255+    def __init__(self, contentstring=''):
256+        self.buffer = contentstring
257+        self.pos = 0
258+    def open(self, mode='r'):
259+        return self
260+    def write(self, instring):
261+        begin = self.pos
262+        padlen = begin - len(self.buffer)
263+        if padlen > 0:
264+            self.buffer += '\x00' * padlen
265+        end = self.pos + len(instring)
266+        self.buffer = self.buffer[:begin]+instring+self.buffer[end:]
267+        self.pos = end
268+    def close(self):
269+        self.pos = 0
270+    def seek(self, pos):
271+        self.pos = pos
272+    def read(self, numberbytes):
273+        return self.buffer[self.pos:self.pos+numberbytes]
274+    def tell(self):
275+        return self.pos
276+    def size(self):
277+        # XXX This method A: Is not to be found in a real file B: Is part of a wild-mung-up of filepath.stat!
278+        # XXX Finally we shall hopefully use a getsize method soon, must consult first though.
279+        # Hmmm...  perhaps we need to sometimes stat the address when there's not a mockfileobject present?
280+        return {stat.ST_SIZE:len(self.buffer)}
281+    def getsize(self):
282+        return len(self.buffer)
283+
284+class MockBCC:
285+    def setServiceParent(self, Parent):
286+        pass
287+
288+
289+class MockLCC:
290+    def setServiceParent(self, Parent):
291+        pass
292+
293+
294+class TestServerWithNullBackend(unittest.TestCase, ReallyEqualMixin):
295+    """ NullBackend is just for testing and executable documentation, so
296+    this test is actually a test of StorageServer in which we're using
297+    NullBackend as helper code for the test, rather than a test of
298+    NullBackend. """
299+    def setUp(self):
300+        self.ss = StorageServer(testnodeid, backend=NullCore())
301+
302+    @mock.patch('os.mkdir')
303+    @mock.patch('__builtin__.open')
304+    @mock.patch('os.listdir')
305+    @mock.patch('os.path.isdir')
306+    def test_write_share(self, mockisdir, mocklistdir, mockopen, mockmkdir):
307+        """ Write a new share. This tests that StorageServer's remote_allocate_buckets generates the correct return types when given test-vector arguments.  that bs is of the correct type is verified by bs[0] exercising remote_write without error. """
308+
309+        alreadygot, bs = self.ss.remote_allocate_buckets('teststorage_index', 'x'*32, 'y'*32, set((0,)), 1, mock.Mock())
310+        bs[0].remote_write(0, 'a')
311+        self.failIf(mockisdir.called)
312+        self.failIf(mocklistdir.called)
313+        self.failIf(mockopen.called)
314+        self.failIf(mockmkdir.called)
315+
316+
317+class TestServerConstruction(MockFileSystem, ReallyEqualMixin):
318+    def test_create_server_fs_backend(self):
319+        """ This tests whether a server instance can be constructed with a
320+        filesystem backend. To pass the test, it mustn't use the filesystem
321+        outside of its configured storedir. """
322+        StorageServer(testnodeid, backend=DiskCore(self.storedir, expiration_policy))
323+
324+
325+class TestServerAndFSBackend(MockFileSystem, ReallyEqualMixin):
326+    """ This tests both the StorageServer and the Disk backend together. """
327+    def setUp(self):
328+        MockFileSystem.setUp(self)
329+        try:
330+            self.backend = DiskCore(self.storedir, expiration_policy)
331+            self.ss = StorageServer(testnodeid, self.backend)
332+
333+            self.backendwithreserve = DiskCore(self.storedir, expiration_policy, reserved_space = 1)
334+            self.sswithreserve = StorageServer(testnodeid, self.backendwithreserve)
335+        except:
336+            MockFileSystem.tearDown(self)
337+            raise
338+
339+    @mock.patch('time.time')
340+    @mock.patch('allmydata.util.fileutil.get_available_space')
341+    def test_out_of_space(self, mockget_available_space, mocktime):
342+        mocktime.return_value = 0
343+
344+        def call_get_available_space(dir, reserve):
345+            return 0
346+
347+        mockget_available_space.side_effect = call_get_available_space
348+        alreadygotc, bsc = self.sswithreserve.remote_allocate_buckets('teststorage_index', 'x'*32, 'y'*32, set((0,)), 1, mock.Mock())
349+        self.failUnlessReallyEqual(bsc, {})
350+
351+    @mock.patch('time.time')
352+    def test_write_and_read_share(self, mocktime):
353+        """
354+        Write a new share, read it, and test the server's (and FS backend's)
355+        handling of simultaneous and successive attempts to write the same
356+        share.
357+        """
358+        mocktime.return_value = 0
359+        # Inspect incoming and fail unless it's empty.
360+        incomingset = self.ss.backend.get_incoming_shnums('teststorage_index')
361+
362+        self.failUnlessReallyEqual(incomingset, frozenset())
363+
364+        # Populate incoming with the sharenum: 0.
365+        alreadygot, bs = self.ss.remote_allocate_buckets('teststorage_index', 'x'*32, 'y'*32, frozenset((0,)), 1, mock.Mock())
366+
367+        # This is a transparent-box test: Inspect incoming and fail unless the sharenum: 0 is listed there.
368+        self.failUnlessReallyEqual(self.ss.backend.get_incoming_shnums('teststorage_index'), frozenset((0,)))
369+
370+
371+
372+        # Attempt to create a second share writer with the same sharenum.
373+        alreadygota, bsa = self.ss.remote_allocate_buckets('teststorage_index', 'x'*32, 'y'*32, frozenset((0,)), 1, mock.Mock())
374+
375+        # Show that no sharewriter results from a remote_allocate_buckets
376+        # with the same si and sharenum, until BucketWriter.remote_close()
377+        # has been called.
378+        self.failIf(bsa)
379+
380+        # Test allocated size.
381+        spaceint = self.ss.allocated_size()
382+        self.failUnlessReallyEqual(spaceint, 1)
383+
384+        # Write 'a' to shnum 0. Only tested together with close and read.
385+        bs[0].remote_write(0, 'a')
386+
387+        # Preclose: Inspect final, failUnless nothing there.
388+        self.failUnlessReallyEqual(len(list(self.backend.get_shares('teststorage_index'))), 0)
389+        bs[0].remote_close()
390+
391+        # Postclose: (Omnibus) failUnless written data is in final.
392+        sharesinfinal = list(self.backend.get_shares('teststorage_index'))
393+        self.failUnlessReallyEqual(len(sharesinfinal), 1)
394+        contents = sharesinfinal[0].read_share_data(0, 73)
395+        self.failUnlessReallyEqual(contents, client_data)
396+
397+        # Exercise the case that the share we're asking to allocate is
398+        # already (completely) uploaded.
399+        self.ss.remote_allocate_buckets('teststorage_index', 'x'*32, 'y'*32, set((0,)), 1, mock.Mock())
400+
401+
402+    def test_read_old_share(self):
403+        """ This tests whether the code correctly finds and reads
404+        shares written out by old (Tahoe-LAFS <= v1.8.2)
405+        servers. There is a similar test in test_download, but that one
406+        is from the perspective of the client and exercises a deeper
407+        stack of code. This one is for exercising just the
408+        StorageServer object. """
409+        # Contruct a file with the appropriate contents in the mockfilesystem.
410+        datalen = len(share_data)
411+        finalhome = si_si2dir(self.basedir, 'teststorage_index').child(str(0))
412+        finalhome.setContent(share_data)
413+
414+        # Now begin the test.
415+        bs = self.ss.remote_get_buckets('teststorage_index')
416+
417+        self.failUnlessEqual(len(bs), 1)
418+        b = bs['0']
419+        # These should match by definition, the next two cases cover cases without (completely) unambiguous behaviors.
420+        self.failUnlessReallyEqual(b.remote_read(0, datalen), client_data)
421+        # If you try to read past the end you get the as much data as is there.
422+        self.failUnlessReallyEqual(b.remote_read(0, datalen+20), client_data)
423+        # If you start reading past the end of the file you get the empty string.
424+        self.failUnlessReallyEqual(b.remote_read(datalen+1, 3), '')
425}
426[backends:  Adds directory backends and minimal children e.g. __init__.py(s).
427wilcoxjg@gmail.com**20110810210944
428 Ignore-this: 9b9ba9a95cdb902f94d2ed0d314bc31
429  The patch-set adds code in order; such that first the smallest system-under-test
430 passes, then larger systems (in their own test methods) are exercised/tested. This
431 patch adds a minimal directory/file structure under "backends" such that import
432 calls in test_backends do not raise exceptions; while the simpler tests, that do not
433 depend on all of the backend code, are run.
434] {
435adddir ./src/allmydata/storage/backends
436addfile ./src/allmydata/storage/backends/__init__.py
437adddir ./src/allmydata/storage/backends/disk
438addfile ./src/allmydata/storage/backends/disk/__init__.py
439addfile ./src/allmydata/storage/backends/disk/core.py
440adddir ./src/allmydata/storage/backends/null
441addfile ./src/allmydata/storage/backends/null/__init__.py
442addfile ./src/allmydata/storage/backends/null/core.py
443}
444[disk/core.py: Contains dummy class to permit null tests
445wilcoxjg@gmail.com**20110810212619
446 Ignore-this: c1d8fdb671dc45b109736be02300f6c8
447] hunk ./src/allmydata/storage/backends/disk/core.py 1
448+class DiskCore:
449+    pass
450[backend/null/core.py: Basic functionality of null for server tests.
451wilcoxjg@gmail.com**20110810212754
452 Ignore-this: ab3c376c7cb1606fbf0387a8e5eacdb5
453] hunk ./src/allmydata/storage/backends/null/core.py 1
454+from allmydata.storage.backends.base import Backend
455+from allmydata.storage.immutable import BucketWriter, BucketReader
456+from zope.interface import implements
457+from allmydata.interfaces import IStorageBackend, IStorageBackendShare
458+
459+class NullCore(Backend):
460+    implements(IStorageBackend)
461+    def __init__(self):
462+        Backend.__init__(self)
463+
464+    def get_available_space(self):
465+        return None
466+
467+    def get_shares(self, storage_index):
468+        return set()
469+
470+    def get_share(self, storage_index, sharenum):
471+        return None
472+
473+    def make_bucket_writer(self, storageindex, shnum, max_space_per_bucket, lease_info, canary):
474+        immutableshare = ImmutableShare()
475+        return BucketWriter(self.ss, immutableshare, max_space_per_bucket, lease_info, canary)
476+
477+    def set_storage_server(self, ss):
478+        self.ss = ss
479+
480+    def get_incoming_shnums(self, storageindex):
481+        return frozenset()
482+
483+class ImmutableShare:
484+    implements(IStorageBackendShare)
485+    sharetype = "immutable"
486+
487+    def __init__(self):
488+        """ If max_size is not None then I won't allow more than
489+        max_size to be written to me. If create=True then max_size
490+        must not be None. """
491+        pass
492+
493+    def get_shnum(self):
494+        return self.shnum
495+
496+    def unlink(self):
497+        os.unlink(self.fname)
498+
499+    def read_share_data(self, offset, length):
500+        precondition(offset >= 0)
501+        # Reads beyond the end of the data are truncated. Reads that start
502+        # beyond the end of the data return an empty string.
503+        seekpos = self._data_offset+offset
504+        fsize = os.path.getsize(self.fname)
505+        actuallength = max(0, min(length, fsize-seekpos))
506+        if actuallength == 0:
507+            return ""
508+        f = open(self.fname, 'rb')
509+        f.seek(seekpos)
510+        return f.read(actuallength)
511+
512+    def write_share_data(self, offset, data):
513+        pass
514+
515+    def _write_lease_record(self, f, lease_number, lease_info):
516+        offset = self._lease_offset + lease_number * self.LEASE_SIZE
517+        f.seek(offset)
518+        assert f.tell() == offset
519+        f.write(lease_info.to_immutable_data())
520+
521+    def _read_num_leases(self, f):
522+        f.seek(0x08)
523+        (num_leases,) = struct.unpack(">L", f.read(4))
524+        return num_leases
525+
526+    def _write_num_leases(self, f, num_leases):
527+        f.seek(0x08)
528+        f.write(struct.pack(">L", num_leases))
529+
530+    def _truncate_leases(self, f, num_leases):
531+        f.truncate(self._lease_offset + num_leases * self.LEASE_SIZE)
532+
533+    def get_leases(self):
534+        """Yields a LeaseInfo instance for all leases."""
535+        f = open(self.fname, 'rb')
536+        (version, unused, num_leases) = struct.unpack(">LLL", f.read(0xc))
537+        f.seek(self._lease_offset)
538+        for i in range(num_leases):
539+            data = f.read(self.LEASE_SIZE)
540+            if data:
541+                yield LeaseInfo().from_immutable_data(data)
542+
543+    def add_lease(self, lease):
544+        pass
545+
546+    def renew_lease(self, renew_secret, new_expire_time):
547+        for i,lease in enumerate(self.get_leases()):
548+            if constant_time_compare(lease.renew_secret, renew_secret):
549+                # yup. See if we need to update the owner time.
550+                if new_expire_time > lease.expiration_time:
551+                    # yes
552+                    lease.expiration_time = new_expire_time
553+                    f = open(self.fname, 'rb+')
554+                    self._write_lease_record(f, i, lease)
555+                    f.close()
556+                return
557+        raise IndexError("unable to renew non-existent lease")
558+
559+    def add_or_renew_lease(self, lease_info):
560+        try:
561+            self.renew_lease(lease_info.renew_secret,
562+                             lease_info.expiration_time)
563+        except IndexError:
564+            self.add_lease(lease_info)
565+
566+
567+    def cancel_lease(self, cancel_secret):
568+        """Remove a lease with the given cancel_secret. If the last lease is
569+        cancelled, the file will be removed. Return the number of bytes that
570+        were freed (by truncating the list of leases, and possibly by
571+        deleting the file. Raise IndexError if there was no lease with the
572+        given cancel_secret.
573+        """
574+
575+        leases = list(self.get_leases())
576+        num_leases_removed = 0
577+        for i,lease in enumerate(leases):
578+            if constant_time_compare(lease.cancel_secret, cancel_secret):
579+                leases[i] = None
580+                num_leases_removed += 1
581+        if not num_leases_removed:
582+            raise IndexError("unable to find matching lease to cancel")
583+        if num_leases_removed:
584+            # pack and write out the remaining leases. We write these out in
585+            # the same order as they were added, so that if we crash while
586+            # doing this, we won't lose any non-cancelled leases.
587+            leases = [l for l in leases if l] # remove the cancelled leases
588+            f = open(self.fname, 'rb+')
589+            for i,lease in enumerate(leases):
590+                self._write_lease_record(f, i, lease)
591+            self._write_num_leases(f, len(leases))
592+            self._truncate_leases(f, len(leases))
593+            f.close()
594+        space_freed = self.LEASE_SIZE * num_leases_removed
595+        if not len(leases):
596+            space_freed += os.stat(self.fname)[stat.ST_SIZE]
597+            self.unlink()
598+        return space_freed
599[backends/base.py: The addition of this file gives backend core objects access to their twisted.application.service superclass.
600wilcoxjg@gmail.com**20110810213155
601 Ignore-this: a382a05d3b9dd7bb46a6bc6c6fb37006
602] {
603addfile ./src/allmydata/storage/backends/base.py
604hunk ./src/allmydata/storage/backends/base.py 1
605+from twisted.application import service
606+
607+class Backend(service.MultiService):
608+    def __init__(self):
609+        service.MultiService.__init__(self)
610}
611[allmydata/interfaces.py: Add interfaces for IStorageBackend and IStorageBackendShare
612wilcoxjg@gmail.com**20110810213653
613 Ignore-this: 9f5fa9627315487c943ac7b0988ea4a2
614   All core objects in storage backends will implement IStorageBackend, likewise
615 IStorageBackendShare will be implemented by ImmutableShare objects that live on the
616 backends.
617   These interface definitions are skeletal at this stage because the interfaces
618 for these objects will mature with incorporation of new backend types.
619] {
620hunk ./src/allmydata/interfaces.py 1
621-
622 from zope.interface import Interface
623 from foolscap.api import StringConstraint, ListOf, TupleOf, SetOf, DictOf, \
624      ChoiceOf, IntegerConstraint, Any, RemoteInterface, Referenceable
625hunk ./src/allmydata/interfaces.py 269
626         store that on disk.
627         """
628 
629+class IStorageBackend(Interface):
630+    """
631+    Objects of this kind live on the server side and are used by the
632+    storage server object.
633+    """
634+    def get_available_space(self, reserved_space):
635+        """ Returns available space for share storage in bytes, or
636+        None if this information is not available or if the available
637+        space is unlimited.
638+
639+        If the backend is configured for read-only mode then this will
640+        return 0.
641+
642+        reserved_space is how many bytes to subtract from the answer, so
643+        you can pass how many bytes you would like to leave unused on this
644+        filesystem as reserved_space. """
645+
646+    def get_bucket_shares(self):
647+        """XXX"""
648+
649+    def get_share(self):
650+        """XXX"""
651+
652+    def make_bucket_writer(self):
653+        """XXX"""
654+
655+class IStorageBackendShare(Interface):
656+    """
657+    This object contains as much as all of the share data.  It is intended
658+    for lazy evaluation such that in many use cases substantially less than
659+    all of the share data will be accessed.
660+    """
661+    def is_complete(self):
662+        """
663+        Returns the share state, or None if the share does not exist.
664+        """
665+
666 class IStorageBucketWriter(Interface):
667     """
668     Objects of this kind live on the client side.
669}
670[storage/common.py: add stub si_si2dir method. This will be completed for tests that exercise the Disk backend.
671wilcoxjg@gmail.com**20110810220050
672 Ignore-this: cfa2232a3f0c4657599fc97085c12ead
673] {
674hunk ./src/allmydata/storage/common.py 1
675-
676 import os.path
677 from allmydata.util import base32
678 
679hunk ./src/allmydata/storage/common.py 18
680 def si_a2b(ascii_storageindex):
681     return base32.a2b(ascii_storageindex)
682 
683+def si_si2dir(stub, wub):
684+    pass
685+
686 def storage_index_to_dir(storageindex):
687     sia = si_b2a(storageindex)
688     return os.path.join(sia[:2], sia)
689}
690
691Context:
692
693[test_client.py: relax a check in test_create_drop_uploader so that it should pass on Python 2.4.x. refs #1429
694david-sarah@jacaranda.org**20110810052504
695 Ignore-this: 1380749ceaf33c30e26c50d57476616c
696]
697[test/common_util.py: correct fix to mkdir_nonascii. refs #1472
698david-sarah@jacaranda.org**20110810051906
699 Ignore-this: 93c0c33370bc47d95c26c4cce8e05290
700]
701[test/common_util.py: fix a typo. refs #1472
702david-sarah@jacaranda.org**20110810044235
703 Ignore-this: f88643d7c82cb3577686d77bbff9e2bc
704]
705[test_client.py, test_drop_upload.py: fix pyflakes warnings.
706david-sarah@jacaranda.org**20110810034505
707 Ignore-this: 1e2d71bf2f43d63cbb423d32a6f96793
708]
709[Factor out methods dealing with non-ASCII directories and filenames from test_drop_upload.py into common_util.py. refs #1429, #1472
710david-sarah@jacaranda.org**20110810031558
711 Ignore-this: 3de8f945fa7a58fc318a1184bad0fd1a
712]
713[test_client.py: add a test that the drop-uploader is initialized correctly by client.py. Also give the DropUploader service a name, which is necessary for the test. refs #1429
714david-sarah@jacaranda.org**20110810030538
715 Ignore-this: 13d511ea9bbe9da2dcffe4a91ce94eae
716]
717[drop-upload: rename 'start' method to 'startService', which is what you're supposed to use to start a Service. refs #1429
718david-sarah@jacaranda.org**20110810030345
719 Ignore-this: d1f5e5c63937ea37be37324e2f1ae99d
720]
721[test_drop_upload.py: add comment explaining why we don't use FilePath.setContent. refs #1429
722david-sarah@jacaranda.org**20110810025942
723 Ignore-this: b95358030b63cb467d1d7f1b9a9b6978
724]
725[test_drop_upload.py: fix some grammatical and spelling nits. refs #1429
726david-sarah@jacaranda.org**20110809221231
727 Ignore-this: fd331acddd9f754173f274a34fe62f03
728]
729[drop-upload: report the configured local directory being absent differently from it being a file
730zooko@zooko.com**20110809220930
731 Ignore-this: a08879100f5f20e609be3f0ffa3b25cc
732 refs #1429
733]
734[drop-upload: rename the 'upload.uri' parameter to 'upload.dircap', and a couple of cleanups to error messages. refs #1429
735zooko@zooko.com**20110809220508
736 Ignore-this: 4846368cbe331e8653bdce1f314e276b
737 I rerecorded this patch, originally by David-Sarah, to use "darcs replace" instead of editing to do the renames. This uncovered one missed rename in Client.init_drop_uploader. (Which also means that code isn't exercised by the current unit tests.)
738 refs #1429
739]
740[drop-upload test for non-existent local dir separately from test for non-directory local dir
741zooko@zooko.com**20110809220115
742 Ignore-this: cd85f345c02f5cb71b1c1527bd4ebddc
743 A candidate patch for #1429 has a bug when it is using FilePath.is_dir() to detect whether the configured local dir exists and is a directory. FilePath.is_dir() raises exception, instead of returning False, if the thing doesn't exist. This test is to make sure that DropUploader.__init__ raise different exceptions for those two cases.
744 refs #1429
745]
746[drop-upload: unit tests for the configuration options being named "cap" instead of "uri"
747zooko@zooko.com**20110809215913
748 Ignore-this: 958c78fffb3d76b3e4817647f824e7f9
749 This is a subset of a patch that David-Sarah attached to #1429. This is just the unit-tests part of that patch, and uses darcs record instead of hunks to change the names.
750 refs #1429
751]
752[src/allmydata/storage/server.py: use the filesystem of storage/shares/, rather than storage/, to calculate remaining space. fixes #1384
753david-sarah@jacaranda.org**20110719022752
754 Ignore-this: a4781043cfd453dbb66ae4f108d80bea
755]
756[test_storage.py: test that we are using the filesystem of storage/shares/, rather than storage/, to calculate remaining space, and that the HTML status output reflects the values returned by fileutil.get_disk_stats. This version works with older versions of the mock library. refs #1384
757david-sarah@jacaranda.org**20110809190722
758 Ignore-this: db447caca37a459ca49563efa58db58c
759]
760[Work around ref #1472 by having test_drop_upload delete the non-ASCII directories it creates.
761david-sarah@jacaranda.org**20110809012334
762 Ignore-this: 5881fd5db419ba8ad12e0b2a82f6c4f0
763]
764[Remove all trailing whitespace from .py files.
765david-sarah@jacaranda.org**20110809001117
766 Ignore-this: d2658b5ce44af70cc606ae4d3085b7cc
767]
768[test_drop_upload.py: fix unused imports. refs #1429
769david-sarah@jacaranda.org**20110808235422
770 Ignore-this: 834f6b946bfea699d7d8c743edd66671
771]
772[Documentation for drop-upload frontend. refs #1429
773david-sarah@jacaranda.org**20110808182146
774 Ignore-this: b33110834e586c0b784d1736c2af5779
775]
776[Drop-upload frontend, rerecorded for 1.9 beta (and correcting a minor mistake). Includes some fixes for Windows but not the Windows inotify implementation. fixes #1429
777david-sarah@jacaranda.org**20110808234049
778 Ignore-this: 67f824c7f554e9a3a85f9fd2e1123d97
779]
780[node.py: ensure that client and introducer nodes record their port number and use that port on the next restart, fixing a regression caused by #1385. fixes #1469.
781david-sarah@jacaranda.org**20110806221934
782 Ignore-this: 1aa9d340b6570320ab2f9edc89c9e0a8
783]
784[test_runner.py: fix a race condition in the test when NODE_URL_FILE is written before PORTNUM_FILE. refs #1469
785david-sarah@jacaranda.org**20110806231842
786 Ignore-this: ab01ae7cec3a073e29eec473e64052a0
787]
788[test_runner.py: cleanups of HOTLINE_FILE writing and removal.
789david-sarah@jacaranda.org**20110806231652
790 Ignore-this: 25f5c5d6f5d8faebb26a4ce80110a335
791]
792[test_runner.py: remove an unused constant.
793david-sarah@jacaranda.org**20110806221416
794 Ignore-this: eade2695cbabbea9cafeaa8debe410bb
795]
796[node.py: fix the error path for a missing config option so that it works for a Unicode base directory.
797david-sarah@jacaranda.org**20110806221007
798 Ignore-this: 4eb9cc04b2ce05182a274a0d69dafaf3
799]
800[test_runner.py: test that client and introducer nodes record their port number and use that port on the next restart. This tests for a regression caused by ref #1385.
801david-sarah@jacaranda.org**20110806220635
802 Ignore-this: 40a0c040b142dbddd47e69b3c3712f5
803]
804[test_runner.py: fix a bug in CreateNode.do_create introduced in changeset [5114] when the tahoe.cfg file has been written with CRLF line endings. refs #1385
805david-sarah@jacaranda.org**20110804003032
806 Ignore-this: 7b7afdcf99da6671afac2d42828883eb
807]
808[test_client.py: repair Basic.test_error_on_old_config_files. refs #1385
809david-sarah@jacaranda.org**20110803235036
810 Ignore-this: 31e2a9c3febe55948de7e144353663e
811]
812[test_checker.py: increase timeout for TooParallel.test_immutable again. The ARM buildslave took 38 seconds, so 40 seconds is too close to the edge; make it 80.
813david-sarah@jacaranda.org**20110803214042
814 Ignore-this: 2d8026a6b25534e01738f78d6c7495cb
815]
816[test_runner.py: fix RunNode.test_introducer to not rely on the mtime of introducer.furl to detect when the node has restarted. Instead we detect when node.url has been written. refs #1385
817david-sarah@jacaranda.org**20110803180917
818 Ignore-this: 11ddc43b107beca42cb78af88c5c394c
819]
820[Further improve error message about old config files. refs #1385
821david-sarah@jacaranda.org**20110803174546
822 Ignore-this: 9d6cc3c288d9863dce58faafb3855917
823]
824[Slightly improve error message about old config files (avoid unnecessary Unicode escaping). refs #1385
825david-sarah@jacaranda.org**20110803163848
826 Ignore-this: a3e3930fba7ccf90b8db3d2ed5829df4
827]
828[test_checker.py: increase timeout for TooParallel.test_immutable (was consistently failing on ARM buildslave).
829david-sarah@jacaranda.org**20110803163213
830 Ignore-this: d0efceaf12628e8791862b80c85b5d56
831]
832[Fix the bug that prevents an introducer from starting when introducer.furl already exists. Also remove some dead code that used to read old config files, and rename 'warn_about_old_config_files' to reflect that it's not a warning. refs #1385
833david-sarah@jacaranda.org**20110803013212
834 Ignore-this: 2d6cd14bd06a7493b26f2027aff78f4d
835]
836[test_runner.py: modify RunNode.test_introducer to test that starting an introducer works when the introducer.furl file already exists. refs #1385
837david-sarah@jacaranda.org**20110803012704
838 Ignore-this: 8cf7f27ac4bfbb5ad8ca4a974106d437
839]
840[verifier: correct a bug introduced in changeset [5106] that caused us to only verify the first block of a file. refs #1395
841david-sarah@jacaranda.org**20110802172437
842 Ignore-this: 87fb77854a839ff217dce73544775b11
843]
844[test_repairer: add a deterministic test of share data corruption that always flips the bits of the last byte of the share data. refs #1395
845david-sarah@jacaranda.org**20110802175841
846 Ignore-this: 72f54603785007e88220c8d979e08be7
847]
848[verifier: serialize the fetching of blocks within a share so that we don't use too much RAM
849zooko@zooko.com**20110802063703
850 Ignore-this: debd9bac07dcbb6803f835a9e2eabaa1
851 
852 Shares are still verified in parallel, but within a share, don't request a
853 block until the previous block has been verified and the memory we used to hold
854 it has been freed up.
855 
856 Patch originally due to Brian. This version has a mockery-patchery-style test
857 which is "low tech" (it implements the patching inline in the test code instead
858 of using an extension of the mock.patch() function from the mock library) and
859 which unpatches in case of exception.
860 
861 fixes #1395
862]
863[add docs about timing-channel attacks
864Brian Warner <warner@lothar.com>**20110802044541
865 Ignore-this: 73114d5f5ed9ce252597b707dba3a194
866]
867['test-coverage' now needs PYTHONPATH=. to find TOP/twisted/plugins/
868Brian Warner <warner@lothar.com>**20110802041952
869 Ignore-this: d40f1f4cb426ea1c362fc961baedde2
870]
871[remove nodeid from WriteBucketProxy classes and customers
872warner@lothar.com**20110801224317
873 Ignore-this: e55334bb0095de11711eeb3af827e8e8
874 refs #1363
875]
876[remove get_serverid() from ReadBucketProxy and customers, including Checker
877warner@lothar.com**20110801224307
878 Ignore-this: 837aba457bc853e4fd413ab1a94519cb
879 and debug.py dump-share commands
880 refs #1363
881]
882[reject old-style (pre-Tahoe-LAFS-v1.3) configuration files
883zooko@zooko.com**20110801232423
884 Ignore-this: b58218fcc064cc75ad8f05ed0c38902b
885 Check for the existence of any of them and if any are found raise exception which will abort the startup of the node.
886 This is a backwards-incompatible change for anyone who is still using old-style configuration files.
887 fixes #1385
888]
889[whitespace-cleanup
890zooko@zooko.com**20110725015546
891 Ignore-this: 442970d0545183b97adc7bd66657876c
892]
893[tests: use fileutil.write() instead of open() to ensure timely close even without CPython-style reference counting
894zooko@zooko.com**20110331145427
895 Ignore-this: 75aae4ab8e5fa0ad698f998aaa1888ce
896 Some of these already had an explicit close() but I went ahead and replaced them with fileutil.write() as well for the sake of uniformity.
897]
898[Address Kevan's comment in #776 about Options classes missed when adding 'self.command_name'. refs #776, #1359
899david-sarah@jacaranda.org**20110801221317
900 Ignore-this: 8881d42cf7e6a1d15468291b0cb8fab9
901]
902[docs/frontends/webapi.rst: change some more instances of 'delete' or 'remove' to 'unlink', change some section titles, and use two blank lines between all sections. refs #776, #1104
903david-sarah@jacaranda.org**20110801220919
904 Ignore-this: 572327591137bb05c24c44812d4b163f
905]
906[cleanup: implement rm as a synonym for unlink rather than vice-versa. refs #776
907david-sarah@jacaranda.org**20110801220108
908 Ignore-this: 598dcbed870f4f6bb9df62de9111b343
909]
910[docs/webapi.rst: address Kevan's comments about use of 'delete' on ref #1104
911david-sarah@jacaranda.org**20110801205356
912 Ignore-this: 4fbf03864934753c951ddeff64392491
913]
914[docs: some changes of 'delete' or 'rm' to 'unlink'. refs #1104
915david-sarah@jacaranda.org**20110713002722
916 Ignore-this: 304d2a330d5e6e77d5f1feed7814b21c
917]
918[WUI: change the label of the button to unlink a file from 'del' to 'unlink'. Also change some internal names to 'unlink', and allow 't=unlink' as a synonym for 't=delete' in the web-API interface. Incidentally, improve a test to check for the rename button as well as the unlink button. fixes #1104
919david-sarah@jacaranda.org**20110713001218
920 Ignore-this: 3eef6b3f81b94a9c0020a38eb20aa069
921]
922[src/allmydata/web/filenode.py: delete a stale comment that was made incorrect by changeset [3133].
923david-sarah@jacaranda.org**20110801203009
924 Ignore-this: b3912e95a874647027efdc97822dd10e
925]
926[fix typo introduced during rebasing of 'remove get_serverid from
927Brian Warner <warner@lothar.com>**20110801200341
928 Ignore-this: 4235b0f585c0533892193941dbbd89a8
929 DownloadStatus.add_dyhb_request and customers' patch, to fix test failure.
930]
931[remove get_serverid from DownloadStatus.add_dyhb_request and customers
932zooko@zooko.com**20110801185401
933 Ignore-this: db188c18566d2d0ab39a80c9dc8f6be6
934 This patch is a rebase of a patch originally written by Brian. I didn't change any of the intent of Brian's patch, just ported it to current trunk.
935 refs #1363
936]
937[remove get_serverid from DownloadStatus.add_block_request and customers
938zooko@zooko.com**20110801185344
939 Ignore-this: 8bfa8201d6147f69b0fbe31beea9c1e
940 This is a rebase of a patch Brian originally wrote. I haven't changed the intent of that patch, just ported it to trunk.
941 refs #1363
942]
943[apply zooko's advice: storage_client get_known_servers() returns a frozenset, caller sorts
944warner@lothar.com**20110801174452
945 Ignore-this: 2aa13ea6cbed4e9084bd604bf8633692
946 refs #1363
947]
948[test_immutable.Test: rewrite to use NoNetworkGrid, now takes 2.7s not 97s
949warner@lothar.com**20110801174444
950 Ignore-this: 54f30b5d7461d2b3514e2a0172f3a98c
951 remove now-unused ShareManglingMixin
952 refs #1363
953]
954[DownloadStatus.add_known_share wants to be used by Finder, web.status
955warner@lothar.com**20110801174436
956 Ignore-this: 1433bcd73099a579abe449f697f35f9
957 refs #1363
958]
959[replace IServer.name() with get_name(), and get_longname()
960warner@lothar.com**20110801174428
961 Ignore-this: e5a6f7f6687fd7732ddf41cfdd7c491b
962 
963 This patch was originally written by Brian, but was re-recorded by Zooko to use
964 darcs replace instead of hunks for any file in which it would result in fewer
965 total hunks.
966 refs #1363
967]
968[upload.py: apply David-Sarah's advice rename (un)contacted(2) trackers to first_pass/second_pass/next_pass
969zooko@zooko.com**20110801174143
970 Ignore-this: e36e1420bba0620a0107bd90032a5198
971 This patch was written by Brian but was re-recorded by Zooko (with David-Sarah looking on) to use darcs replace instead of editing to rename the three variables to their new names.
972 refs #1363
973]
974[Coalesce multiple Share.loop() calls, make downloads faster. Closes #1268.
975Brian Warner <warner@lothar.com>**20110801151834
976 Ignore-this: 48530fce36c01c0ff708f61c2de7e67a
977]
978[src/allmydata/_auto_deps.py: 'i686' is another way of spelling x86.
979david-sarah@jacaranda.org**20110801034035
980 Ignore-this: 6971e0621db2fba794d86395b4d51038
981]
982[tahoe_rm.py: better error message when there is no path. refs #1292
983david-sarah@jacaranda.org**20110122064212
984 Ignore-this: ff3bb2c9f376250e5fd77eb009e09018
985]
986[test_cli.py: Test for error message when 'tahoe rm' is invoked without a path. refs #1292
987david-sarah@jacaranda.org**20110104105108
988 Ignore-this: 29ec2f2e0251e446db96db002ad5dd7d
989]
990[src/allmydata/__init__.py: suppress a spurious warning from 'bin/tahoe --version[-and-path]' about twisted-web and twisted-core packages.
991david-sarah@jacaranda.org**20110801005209
992 Ignore-this: 50e7cd53cca57b1870d9df0361c7c709
993]
994[test_cli.py: use to_str on fields loaded using simplejson.loads in new tests. refs #1304
995david-sarah@jacaranda.org**20110730032521
996 Ignore-this: d1d6dfaefd1b4e733181bf127c79c00b
997]
998[cli: make 'tahoe cp' overwrite mutable files in-place
999Kevan Carstensen <kevan@isnotajoke.com>**20110729202039
1000 Ignore-this: b2ad21a19439722f05c49bfd35b01855
1001]
1002[SFTP: write an error message to standard error for unrecognized shell commands. Change the existing message for shell sessions to be written to standard error, and refactor some duplicated code. Also change the lines of the error messages to end in CRLF, and take into account Kevan's review comments. fixes #1442, #1446
1003david-sarah@jacaranda.org**20110729233102
1004 Ignore-this: d2f2bb4664f25007d1602bf7333e2cdd
1005]
1006[src/allmydata/scripts/cli.py: fix pyflakes warning.
1007david-sarah@jacaranda.org**20110728021402
1008 Ignore-this: 94050140ddb99865295973f49927c509
1009]
1010[Fix the help synopses of CLI commands to include [options] in the right place. fixes #1359, fixes #636
1011david-sarah@jacaranda.org**20110724225440
1012 Ignore-this: 2a8e488a5f63dabfa9db9efd83768a5
1013]
1014[encodingutil: argv and output encodings are always the same on all platforms. Lose the unnecessary generality of them being different. fixes #1120
1015david-sarah@jacaranda.org**20110629185356
1016 Ignore-this: 5ebacbe6903dfa83ffd3ff8436a97787
1017]
1018[docs/man/tahoe.1: add man page. fixes #1420
1019david-sarah@jacaranda.org**20110724171728
1020 Ignore-this: fc7601ec7f25494288d6141d0ae0004c
1021]
1022[Update the dependency on zope.interface to fix an incompatiblity between Nevow and zope.interface 3.6.4. fixes #1435
1023david-sarah@jacaranda.org**20110721234941
1024 Ignore-this: 2ff3fcfc030fca1a4d4c7f1fed0f2aa9
1025]
1026[frontends/ftpd.py: remove the check for IWriteFile.close since we're now guaranteed to be using Twisted >= 10.1 which has it.
1027david-sarah@jacaranda.org**20110722000320
1028 Ignore-this: 55cd558b791526113db3f83c00ec328a
1029]
1030[Update the dependency on Twisted to >= 10.1. This allows us to simplify some documentation: it's no longer necessary to install pywin32 on Windows, or apply a patch to Twisted in order to use the FTP frontend. fixes #1274, #1438. refs #1429
1031david-sarah@jacaranda.org**20110721233658
1032 Ignore-this: 81b41745477163c9b39c0b59db91cc62
1033]
1034[misc/build_helpers/run_trial.py: undo change to block pywin32 (it didn't work because run_trial.py is no longer used). refs #1334
1035david-sarah@jacaranda.org**20110722035402
1036 Ignore-this: 5d03f544c4154f088e26c7107494bf39
1037]
1038[misc/build_helpers/run_trial.py: ensure that pywin32 is not on the sys.path when running the test suite. Includes some temporary debugging printouts that will be removed. refs #1334
1039david-sarah@jacaranda.org**20110722024907
1040 Ignore-this: 5141a9f83a4085ed4ca21f0bbb20bb9c
1041]
1042[docs/running.rst: use 'tahoe run ~/.tahoe' instead of 'tahoe run' (the default is the current directory, unlike 'tahoe start').
1043david-sarah@jacaranda.org**20110718005949
1044 Ignore-this: 81837fbce073e93d88a3e7ae3122458c
1045]
1046[docs/running.rst: say to put the introducer.furl in tahoe.cfg.
1047david-sarah@jacaranda.org**20110717194315
1048 Ignore-this: 954cc4c08e413e8c62685d58ff3e11f3
1049]
1050[README.txt: say that quickstart.rst is in the docs directory.
1051david-sarah@jacaranda.org**20110717192400
1052 Ignore-this: bc6d35a85c496b77dbef7570677ea42a
1053]
1054[setup: remove the dependency on foolscap's "secure_connections" extra, add a dependency on pyOpenSSL
1055zooko@zooko.com**20110717114226
1056 Ignore-this: df222120d41447ce4102616921626c82
1057 fixes #1383
1058]
1059[test_sftp.py cleanup: remove a redundant definition of failUnlessReallyEqual.
1060david-sarah@jacaranda.org**20110716181813
1061 Ignore-this: 50113380b368c573f07ac6fe2eb1e97f
1062]
1063[docs: add missing link in NEWS.rst
1064zooko@zooko.com**20110712153307
1065 Ignore-this: be7b7eb81c03700b739daa1027d72b35
1066]
1067[contrib: remove the contributed fuse modules and the entire contrib/ directory, which is now empty
1068zooko@zooko.com**20110712153229
1069 Ignore-this: 723c4f9e2211027c79d711715d972c5
1070 Also remove a couple of vestigial references to figleaf, which is long gone.
1071 fixes #1409 (remove contrib/fuse)
1072]
1073[add Protovis.js-based download-status timeline visualization
1074Brian Warner <warner@lothar.com>**20110629222606
1075 Ignore-this: 477ccef5c51b30e246f5b6e04ab4a127
1076 
1077 provide status overlap info on the webapi t=json output, add decode/decrypt
1078 rate tooltips, add zoomin/zoomout buttons
1079]
1080[add more download-status data, fix tests
1081Brian Warner <warner@lothar.com>**20110629222555
1082 Ignore-this: e9e0b7e0163f1e95858aa646b9b17b8c
1083]
1084[prepare for viz: improve DownloadStatus events
1085Brian Warner <warner@lothar.com>**20110629222542
1086 Ignore-this: 16d0bde6b734bb501aa6f1174b2b57be
1087 
1088 consolidate IDownloadStatusHandlingConsumer stuff into DownloadNode
1089]
1090[docs: fix error in crypto specification that was noticed by Taylor R Campbell <campbell+tahoe@mumble.net>
1091zooko@zooko.com**20110629185711
1092 Ignore-this: b921ed60c1c8ba3c390737fbcbe47a67
1093]
1094[setup.py: don't make bin/tahoe.pyscript executable. fixes #1347
1095david-sarah@jacaranda.org**20110130235809
1096 Ignore-this: 3454c8b5d9c2c77ace03de3ef2d9398a
1097]
1098[Makefile: remove targets relating to 'setup.py check_auto_deps' which no longer exists. fixes #1345
1099david-sarah@jacaranda.org**20110626054124
1100 Ignore-this: abb864427a1b91bd10d5132b4589fd90
1101]
1102[Makefile: add 'make check' as an alias for 'make test'. Also remove an unnecessary dependency of 'test' on 'build' and 'src/allmydata/_version.py'. fixes #1344
1103david-sarah@jacaranda.org**20110623205528
1104 Ignore-this: c63e23146c39195de52fb17c7c49b2da
1105]
1106[Rename test_package_initialization.py to (much shorter) test_import.py .
1107Brian Warner <warner@lothar.com>**20110611190234
1108 Ignore-this: 3eb3dbac73600eeff5cfa6b65d65822
1109 
1110 The former name was making my 'ls' listings hard to read, by forcing them
1111 down to just two columns.
1112]
1113[tests: fix tests to accomodate [20110611153758-92b7f-0ba5e4726fb6318dac28fb762a6512a003f4c430]
1114zooko@zooko.com**20110611163741
1115 Ignore-this: 64073a5f39e7937e8e5e1314c1a302d1
1116 Apparently none of the two authors (stercor, terrell), three reviewers (warner, davidsarah, terrell), or one committer (me) actually ran the tests. This is presumably due to #20.
1117 fixes #1412
1118]
1119[wui: right-align the size column in the WUI
1120zooko@zooko.com**20110611153758
1121 Ignore-this: 492bdaf4373c96f59f90581c7daf7cd7
1122 Thanks to Ted "stercor" Rolle Jr. and Terrell Russell.
1123 fixes #1412
1124]
1125[docs: three minor fixes
1126zooko@zooko.com**20110610121656
1127 Ignore-this: fec96579eb95aceb2ad5fc01a814c8a2
1128 CREDITS for arc for stats tweak
1129 fix link to .zip file in quickstart.rst (thanks to ChosenOne for noticing)
1130 English usage tweak
1131]
1132[docs/running.rst: fix stray HTML (not .rst) link noticed by ChosenOne.
1133david-sarah@jacaranda.org**20110609223719
1134 Ignore-this: fc50ac9c94792dcac6f1067df8ac0d4a
1135]
1136[server.py:  get_latencies now reports percentiles _only_ if there are sufficient observations for the interpretation of the percentile to be unambiguous.
1137wilcoxjg@gmail.com**20110527120135
1138 Ignore-this: 2e7029764bffc60e26f471d7c2b6611e
1139 interfaces.py:  modified the return type of RIStatsProvider.get_stats to allow for None as a return value
1140 NEWS.rst, stats.py: documentation of change to get_latencies
1141 stats.rst: now documents percentile modification in get_latencies
1142 test_storage.py:  test_latencies now expects None in output categories that contain too few samples for the associated percentile to be unambiguously reported.
1143 fixes #1392
1144]
1145[docs: revert link in relnotes.txt from NEWS.rst to NEWS, since the former did not exist at revision 5000.
1146david-sarah@jacaranda.org**20110517011214
1147 Ignore-this: 6a5be6e70241e3ec0575641f64343df7
1148]
1149[docs: convert NEWS to NEWS.rst and change all references to it.
1150david-sarah@jacaranda.org**20110517010255
1151 Ignore-this: a820b93ea10577c77e9c8206dbfe770d
1152]
1153[docs: remove out-of-date docs/testgrid/introducer.furl and containing directory. fixes #1404
1154david-sarah@jacaranda.org**20110512140559
1155 Ignore-this: 784548fc5367fac5450df1c46890876d
1156]
1157[scripts/common.py: don't assume that the default alias is always 'tahoe' (it is, but the API of get_alias doesn't say so). refs #1342
1158david-sarah@jacaranda.org**20110130164923
1159 Ignore-this: a271e77ce81d84bb4c43645b891d92eb
1160]
1161[setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError
1162zooko@zooko.com**20110128142006
1163 Ignore-this: 57d4bc9298b711e4bc9dc832c75295de
1164 I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement().
1165]
1166[M-x whitespace-cleanup
1167zooko@zooko.com**20110510193653
1168 Ignore-this: dea02f831298c0f65ad096960e7df5c7
1169]
1170[docs: fix typo in running.rst, thanks to arch_o_median
1171zooko@zooko.com**20110510193633
1172 Ignore-this: ca06de166a46abbc61140513918e79e8
1173]
1174[relnotes.txt: don't claim to work on Cygwin (which has been untested for some time). refs #1342
1175david-sarah@jacaranda.org**20110204204902
1176 Ignore-this: 85ef118a48453d93fa4cddc32d65b25b
1177]
1178[relnotes.txt: forseeable -> foreseeable. refs #1342
1179david-sarah@jacaranda.org**20110204204116
1180 Ignore-this: 746debc4d82f4031ebf75ab4031b3a9
1181]
1182[replace remaining .html docs with .rst docs
1183zooko@zooko.com**20110510191650
1184 Ignore-this: d557d960a986d4ac8216d1677d236399
1185 Remove install.html (long since deprecated).
1186 Also replace some obsolete references to install.html with references to quickstart.rst.
1187 Fix some broken internal references within docs/historical/historical_known_issues.txt.
1188 Thanks to Ravi Pinjala and Patrick McDonald.
1189 refs #1227
1190]
1191[docs: FTP-and-SFTP.rst: fix a minor error and update the information about which version of Twisted fixes #1297
1192zooko@zooko.com**20110428055232
1193 Ignore-this: b63cfb4ebdbe32fb3b5f885255db4d39
1194]
1195[munin tahoe_files plugin: fix incorrect file count
1196francois@ctrlaltdel.ch**20110428055312
1197 Ignore-this: 334ba49a0bbd93b4a7b06a25697aba34
1198 fixes #1391
1199]
1200[corrected "k must never be smaller than N" to "k must never be greater than N"
1201secorp@allmydata.org**20110425010308
1202 Ignore-this: 233129505d6c70860087f22541805eac
1203]
1204[Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions being stringified differently than in later versions of Python. refs #1389
1205david-sarah@jacaranda.org**20110411190738
1206 Ignore-this: 7847d26bc117c328c679f08a7baee519
1207]
1208[tests: add test for including the ImportError message and traceback entry in the summary of errors from importing dependencies. refs #1389
1209david-sarah@jacaranda.org**20110410155844
1210 Ignore-this: fbecdbeb0d06a0f875fe8d4030aabafa
1211]
1212[allmydata/__init__.py: preserve the message and last traceback entry (file, line number, function, and source line) of ImportErrors in the package versions string. fixes #1389
1213david-sarah@jacaranda.org**20110410155705
1214 Ignore-this: 2f87b8b327906cf8bfca9440a0904900
1215]
1216[remove unused variable detected by pyflakes
1217zooko@zooko.com**20110407172231
1218 Ignore-this: 7344652d5e0720af822070d91f03daf9
1219]
1220[allmydata/__init__.py: Nicer reporting of unparseable version numbers in dependencies. fixes #1388
1221david-sarah@jacaranda.org**20110401202750
1222 Ignore-this: 9c6bd599259d2405e1caadbb3e0d8c7f
1223]
1224[update FTP-and-SFTP.rst: the necessary patch is included in Twisted-10.1
1225Brian Warner <warner@lothar.com>**20110325232511
1226 Ignore-this: d5307faa6900f143193bfbe14e0f01a
1227]
1228[control.py: remove all uses of s.get_serverid()
1229warner@lothar.com**20110227011203
1230 Ignore-this: f80a787953bd7fa3d40e828bde00e855
1231]
1232[web: remove some uses of s.get_serverid(), not all
1233warner@lothar.com**20110227011159
1234 Ignore-this: a9347d9cf6436537a47edc6efde9f8be
1235]
1236[immutable/downloader/fetcher.py: remove all get_serverid() calls
1237warner@lothar.com**20110227011156
1238 Ignore-this: fb5ef018ade1749348b546ec24f7f09a
1239]
1240[immutable/downloader/fetcher.py: fix diversity bug in server-response handling
1241warner@lothar.com**20110227011153
1242 Ignore-this: bcd62232c9159371ae8a16ff63d22c1b
1243 
1244 When blocks terminate (either COMPLETE or CORRUPT/DEAD/BADSEGNUM), the
1245 _shares_from_server dict was being popped incorrectly (using shnum as the
1246 index instead of serverid). I'm still thinking through the consequences of
1247 this bug. It was probably benign and really hard to detect. I think it would
1248 cause us to incorrectly believe that we're pulling too many shares from a
1249 server, and thus prefer a different server rather than asking for a second
1250 share from the first server. The diversity code is intended to spread out the
1251 number of shares simultaneously being requested from each server, but with
1252 this bug, it might be spreading out the total number of shares requested at
1253 all, not just simultaneously. (note that SegmentFetcher is scoped to a single
1254 segment, so the effect doesn't last very long).
1255]
1256[immutable/downloader/share.py: reduce get_serverid(), one left, update ext deps
1257warner@lothar.com**20110227011150
1258 Ignore-this: d8d56dd8e7b280792b40105e13664554
1259 
1260 test_download.py: create+check MyShare instances better, make sure they share
1261 Server objects, now that finder.py cares
1262]
1263[immutable/downloader/finder.py: reduce use of get_serverid(), one left
1264warner@lothar.com**20110227011146
1265 Ignore-this: 5785be173b491ae8a78faf5142892020
1266]
1267[immutable/offloaded.py: reduce use of get_serverid() a bit more
1268warner@lothar.com**20110227011142
1269 Ignore-this: b48acc1b2ae1b311da7f3ba4ffba38f
1270]
1271[immutable/upload.py: reduce use of get_serverid()
1272warner@lothar.com**20110227011138
1273 Ignore-this: ffdd7ff32bca890782119a6e9f1495f6
1274]
1275[immutable/checker.py: remove some uses of s.get_serverid(), not all
1276warner@lothar.com**20110227011134
1277 Ignore-this: e480a37efa9e94e8016d826c492f626e
1278]
1279[add remaining get_* methods to storage_client.Server, NoNetworkServer, and
1280warner@lothar.com**20110227011132
1281 Ignore-this: 6078279ddf42b179996a4b53bee8c421
1282 MockIServer stubs
1283]
1284[upload.py: rearrange _make_trackers a bit, no behavior changes
1285warner@lothar.com**20110227011128
1286 Ignore-this: 296d4819e2af452b107177aef6ebb40f
1287]
1288[happinessutil.py: finally rename merge_peers to merge_servers
1289warner@lothar.com**20110227011124
1290 Ignore-this: c8cd381fea1dd888899cb71e4f86de6e
1291]
1292[test_upload.py: factor out FakeServerTracker
1293warner@lothar.com**20110227011120
1294 Ignore-this: 6c182cba90e908221099472cc159325b
1295]
1296[test_upload.py: server-vs-tracker cleanup
1297warner@lothar.com**20110227011115
1298 Ignore-this: 2915133be1a3ba456e8603885437e03
1299]
1300[happinessutil.py: server-vs-tracker cleanup
1301warner@lothar.com**20110227011111
1302 Ignore-this: b856c84033562d7d718cae7cb01085a9
1303]
1304[upload.py: more tracker-vs-server cleanup
1305warner@lothar.com**20110227011107
1306 Ignore-this: bb75ed2afef55e47c085b35def2de315
1307]
1308[upload.py: fix var names to avoid confusion between 'trackers' and 'servers'
1309warner@lothar.com**20110227011103
1310 Ignore-this: 5d5e3415b7d2732d92f42413c25d205d
1311]
1312[refactor: s/peer/server/ in immutable/upload, happinessutil.py, test_upload
1313warner@lothar.com**20110227011100
1314 Ignore-this: 7ea858755cbe5896ac212a925840fe68
1315 
1316 No behavioral changes, just updating variable/method names and log messages.
1317 The effects outside these three files should be minimal: some exception
1318 messages changed (to say "server" instead of "peer"), and some internal class
1319 names were changed. A few things still use "peer" to minimize external
1320 changes, like UploadResults.timings["peer_selection"] and
1321 happinessutil.merge_peers, which can be changed later.
1322]
1323[storage_client.py: clean up test_add_server/test_add_descriptor, remove .test_servers
1324warner@lothar.com**20110227011056
1325 Ignore-this: efad933e78179d3d5fdcd6d1ef2b19cc
1326]
1327[test_client.py, upload.py:: remove KiB/MiB/etc constants, and other dead code
1328warner@lothar.com**20110227011051
1329 Ignore-this: dc83c5794c2afc4f81e592f689c0dc2d
1330]
1331[test: increase timeout on a network test because Francois's ARM machine hit that timeout
1332zooko@zooko.com**20110317165909
1333 Ignore-this: 380c345cdcbd196268ca5b65664ac85b
1334 I'm skeptical that the test was proceeding correctly but ran out of time. It seems more likely that it had gotten hung. But if we raise the timeout to an even more extravagant number then we can be even more certain that the test was never going to finish.
1335]
1336[docs/configuration.rst: add a "Frontend Configuration" section
1337Brian Warner <warner@lothar.com>**20110222014323
1338 Ignore-this: 657018aa501fe4f0efef9851628444ca
1339 
1340 this points to docs/frontends/*.rst, which were previously underlinked
1341]
1342[web/filenode.py: avoid calling req.finish() on closed HTTP connections. Closes #1366
1343"Brian Warner <warner@lothar.com>"**20110221061544
1344 Ignore-this: 799d4de19933f2309b3c0c19a63bb888
1345]
1346[Add unit tests for cross_check_pkg_resources_versus_import, and a regression test for ref #1355. This requires a little refactoring to make it testable.
1347david-sarah@jacaranda.org**20110221015817
1348 Ignore-this: 51d181698f8c20d3aca58b057e9c475a
1349]
1350[allmydata/__init__.py: .name was used in place of the correct .__name__ when printing an exception. Also, robustify string formatting by using %r instead of %s in some places. fixes #1355.
1351david-sarah@jacaranda.org**20110221020125
1352 Ignore-this: b0744ed58f161bf188e037bad077fc48
1353]
1354[Refactor StorageFarmBroker handling of servers
1355Brian Warner <warner@lothar.com>**20110221015804
1356 Ignore-this: 842144ed92f5717699b8f580eab32a51
1357 
1358 Pass around IServer instance instead of (peerid, rref) tuple. Replace
1359 "descriptor" with "server". Other replacements:
1360 
1361  get_all_servers -> get_connected_servers/get_known_servers
1362  get_servers_for_index -> get_servers_for_psi (now returns IServers)
1363 
1364 This change still needs to be pushed further down: lots of code is now
1365 getting the IServer and then distributing (peerid, rref) internally.
1366 Instead, it ought to distribute the IServer internally and delay
1367 extracting a serverid or rref until the last moment.
1368 
1369 no_network.py was updated to retain parallelism.
1370]
1371[TAG allmydata-tahoe-1.8.2
1372warner@lothar.com**20110131020101]
1373Patch bundle hash:
1374dc72b5bc34d726d84cbf41fa02e783731088c7e7