ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-22 22:32:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

storage: clean up use of si_s vs si_dir, add test for BadWriterEnabler message, add some logging

Browse Source
This commit is contained in:
Brian Warner 2008-01-31 17:48:48 -07:00
parent 7bf21082f7
commit 670933ecee
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/allmydata/storage.py
View File

@ -729,7 +729,7 @@ class StorageServer(service.MultiService, Referenceable):
# to a particular owner. # to a particular owner.
alreadygot = set() alreadygot = set()
bucketwriters = {} # k: shnum, v: BucketWriter bucketwriters = {} # k: shnum, v: BucketWriter
si_s = storage_index_to_dir(storage_index) si_dir = storage_index_to_dir(storage_index)
# in this implementation, the lease information (including secrets) # in this implementation, the lease information (including secrets)
# goes into the share files themselves. It could also be put into a # goes into the share files themselves. It could also be put into a
@ -755,8 +755,8 @@ class StorageServer(service.MultiService, Referenceable):
sf.add_or_renew_lease(lease_info) sf.add_or_renew_lease(lease_info)
for shnum in sharenums: for shnum in sharenums:
incominghome = os.path.join(self.incomingdir, si_s, "%d" % shnum) incominghome = os.path.join(self.incomingdir, si_dir, "%d" % shnum)
finalhome = os.path.join(self.sharedir, si_s, "%d" % shnum) finalhome = os.path.join(self.sharedir, si_dir, "%d" % shnum)
if os.path.exists(incominghome) or os.path.exists(finalhome): if os.path.exists(incominghome) or os.path.exists(finalhome):
# great! we already have it. easy. # great! we already have it. easy.
pass pass
@ -775,7 +775,7 @@ class StorageServer(service.MultiService, Referenceable):
pass pass
if bucketwriters: if bucketwriters:
fileutil.make_dirs(os.path.join(self.sharedir, si_s)) fileutil.make_dirs(os.path.join(self.sharedir, si_dir))
return alreadygot, bucketwriters return alreadygot, bucketwriters
@ -900,10 +900,11 @@ class StorageServer(service.MultiService, Referenceable):
secrets, secrets,
test_and_write_vectors, test_and_write_vectors,
read_vector): read_vector):
si_s = storage_index_to_dir(storage_index) si_s = idlib.b2a(storage_index)
si_dir = storage_index_to_dir(storage_index)
(write_enabler, renew_secret, cancel_secret) = secrets (write_enabler, renew_secret, cancel_secret) = secrets
# shares exist if there is a file for them # shares exist if there is a file for them
bucketdir = os.path.join(self.sharedir, si_s) bucketdir = os.path.join(self.sharedir, si_dir)
shares = {} shares = {}
if os.path.isdir(bucketdir): if os.path.isdir(bucketdir):
for sharenum_s in os.listdir(bucketdir): for sharenum_s in os.listdir(bucketdir):
@ -977,9 +978,12 @@ class StorageServer(service.MultiService, Referenceable):
return share return share
def remote_slot_readv(self, storage_index, shares, readv): def remote_slot_readv(self, storage_index, shares, readv):
si_s = storage_index_to_dir(storage_index) si_s = idlib.b2a(storage_index)
lp = log.msg("storage: slot_readv %s %s" % (si_s, shares),
facility="tahoe.storage", level=log.OPERATIONAL)
si_dir = storage_index_to_dir(storage_index)
# shares exist if there is a file for them # shares exist if there is a file for them
bucketdir = os.path.join(self.sharedir, si_s) bucketdir = os.path.join(self.sharedir, si_dir)
if not os.path.isdir(bucketdir): if not os.path.isdir(bucketdir):
return {} return {}
datavs = {} datavs = {}
@ -992,6 +996,8 @@ class StorageServer(service.MultiService, Referenceable):
filename = os.path.join(bucketdir, sharenum_s) filename = os.path.join(bucketdir, sharenum_s)
msf = MutableShareFile(filename, self) msf = MutableShareFile(filename, self)
datavs[sharenum] = msf.readv(readv) datavs[sharenum] = msf.readv(readv)
log.msg("returning shares %s" % (datavs.keys(),),
facility="tahoe.storage", level=log.NOISY, parent=lp)
return datavs return datavs

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

@ -554,9 +554,10 @@ class MutableServer(unittest.TestCase):
#self.failUnlessEqual(s0.remote_get_length(), 100) #self.failUnlessEqual(s0.remote_get_length(), 100)
bad_secrets = ("bad write enabler", secrets[1], secrets[2]) bad_secrets = ("bad write enabler", secrets[1], secrets[2])
self.failUnlessRaises(BadWriteEnablerError, f = self.failUnlessRaises(BadWriteEnablerError,
write, "si1", bad_secrets, write, "si1", bad_secrets,
{}, []) {}, [])
self.failUnless("The write enabler was recorded by nodeid 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'." in f, f)
# this testv should fail # this testv should fail
answer = write("si1", secrets, answer = write("si1", secrets,