ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-19 00:06:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mutable slots: add some test coverage for lease-addition

Browse Source
This commit is contained in:
Brian Warner 2007-10-31 00:38:30 -07:00
parent 68d3d62002
commit 256ef1bf53
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/storage.py
View File

@ -397,13 +397,13 @@ class MutableShareFile(Referenceable):
elif (lease_number-4) < num_extra_leases:
offset = (extra_lease_offset
+ 4
+ (lease_number-4)*self.LEASE_NUMBER)
+ (lease_number-4)*self.LEASE_SIZE)
else:
# must add an extra lease record
self._write_num_extra_leases(f, num_extra_leases+1)
offset = (extra_lease_offset
+ 4
+ (lease_number-4)*self.LEASE_NUMBER)
+ (lease_number-4)*self.LEASE_SIZE)
f.seek(offset)
assert f.tell() == offset
f.write(struct.pack(">LL32s32s32s",
@ -419,7 +419,7 @@ class MutableShareFile(Referenceable):
elif (lease_number-4) < num_extra_leases:
offset = (extra_lease_offset
+ 4
+ (lease_number-4)*self.LEASE_NUMBER)
+ (lease_number-4)*self.LEASE_SIZE)
else:
raise IndexError("No such lease number %d" % lease_number)
f.seek(offset)

46
src/allmydata/test/test_storage.py
View File

@ -466,10 +466,10 @@ class MutableServer(unittest.TestCase):
def write_enabler(self, we_tag):
return hashutil.tagged_hash("we_blah", we_tag)
def allocate(self, ss, storage_index, we_tag, sharenums, size):
def allocate(self, ss, storage_index, we_tag, lease_tag, sharenums, size):
write_enabler = self.write_enabler(we_tag)
renew_secret = hashutil.tagged_hash("blah", "%d" % self._secret.next())
cancel_secret = hashutil.tagged_hash("blah", "%d" % self._secret.next())
renew_secret = hashutil.tagged_hash("blah", str(lease_tag))
cancel_secret = hashutil.tagged_hash("blah", str(lease_tag))
return ss.remote_allocate_mutable_slot(storage_index,
write_enabler,
renew_secret, cancel_secret,
@ -477,7 +477,8 @@ class MutableServer(unittest.TestCase):
def test_allocate(self):
ss = self.create("test_allocate")
shares = self.allocate(ss, "si1", "we1", set([0,1,2]), 100)
shares = self.allocate(ss, "si1", "we1", self._secret.next(),
set([0,1,2]), 100)
self.failUnlessEqual(len(shares), 3)
self.failUnlessEqual(set(shares.keys()), set([0,1,2]))
shares2 = ss.remote_get_mutable_slot("si1")
@ -527,7 +528,8 @@ class MutableServer(unittest.TestCase):
# test operators, the data we're comparing is '11111' in all cases.
# test both fail+pass, reset data after each one.
ss = self.create("test_operators")
shares = self.allocate(ss, "si1", "we1", set([0,1,2]), 100)
shares = self.allocate(ss, "si1", "we1", self._secret.next(),
set([0,1,2]), 100)
s0 = shares[0]
WE = self.write_enabler("we1")
data = "".join([ ("%d" % i) * 10 for i in range(10) ])
@ -678,3 +680,37 @@ class MutableServer(unittest.TestCase):
self.failUnlessEqual(answer, (False, ["11111"]))
self.failUnlessEqual(s0.remote_read(0, 100), data)
s0.remote_testv_and_writev(WE, [], [(0,data)], None)
def test_leases(self):
ss = self.create("test_leases")
secret = 14
shares = self.allocate(ss, "si1", "we1", secret, set([0,1,2]), 100)
s0 = shares[0]
WE = self.write_enabler("we1")
data = "".join([ ("%d" % i) * 10 for i in range(10) ])
answer = s0.remote_testv_and_writev(WE,
[],
[(0, data),],
new_length=None)
# re-allocate the slots and use the same secrets, that should update
# the lease
shares2 = self.allocate(ss, "si1", "we1", secret, set([0,1,2]), 100)
# now allocate them with a bunch of different secrets, to trigger the
# extended lease code
shares2 = self.allocate(ss, "si1", "we1", secret+1, set([0,1,2]), 100)
shares2 = self.allocate(ss, "si1", "we1", secret+2, set([0,1,2]), 100)
shares2 = self.allocate(ss, "si1", "we1", secret+3, set([0,1,2]), 100)
shares2 = self.allocate(ss, "si1", "we1", secret+4, set([0,1,2]), 100)
shares2 = self.allocate(ss, "si1", "we1", secret+5, set([0,1,2]), 100)
# and write enough data to expand the container, forcing the server
# to move the leases
answer = s0.remote_testv_and_writev(WE,
[],
[(0, data),],
new_length=200)
# TODO: read back the leases, make sure they're still intact. We need
# a renew_lease() call for this.