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

use set instead of WeakKeyDictionary

Browse Source
This commit is contained in:
meejah 2019-12-18 17:02:40 -07:00
parent d06127c720
commit 4928d62d66
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/allmydata/storage/server.py
View File

@ -1,4 +1,4 @@
import os, re, weakref, struct, time
import os, re, struct, time
import six
from foolscap.api import Referenceable
@ -67,7 +67,7 @@ class StorageServer(service.MultiService, Referenceable):
self.incomingdir = os.path.join(sharedir, 'incoming')
self._clean_incomplete()
fileutil.make_dirs(self.incomingdir)
self._active_writers = weakref.WeakKeyDictionary()
self._active_writers = set()
log.msg("StorageServer created", facility="tahoe.storage")
if reserved_space:
@ -302,7 +302,7 @@ class StorageServer(service.MultiService, Referenceable):
if self.no_storage:
bw.throw_out_all_data = True
bucketwriters[shnum] = bw
self._active_writers[bw] = 1
self._active_writers.add(bw)
if limited:
remaining_space -= max_space_per_bucket
else:
@ -359,7 +359,7 @@ class StorageServer(service.MultiService, Referenceable):
def bucket_writer_closed(self, bw, consumed_size):
if self.stats_provider:
self.stats_provider.count('storage_server.bytes_added', consumed_size)
del self._active_writers[bw]
self._active_writers.remove(bw)
def _get_bucket_shares(self, storage_index):
"""Return a list of (shnum, pathname) tuples for files that hold

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

@ -541,27 +541,22 @@ class Server(unittest.TestCase):
OVERHEAD = 3*4
LEASE_SIZE = 4+32+32+4
canary = FakeCanary(True)
already,writers = self.allocate(ss, "vid1", [0,1,2], 1000, canary)
already, writers = self.allocate(ss, "vid1", [0,1,2], 1000, canary)
self.failUnlessEqual(len(writers), 3)
# now the StorageServer should have 3000 bytes provisionally
# allocated, allowing only 2000 more to be claimed
self.failUnlessEqual(len(ss._active_writers), 3)
# allocating 1001-byte shares only leaves room for one
already2,writers2 = self.allocate(ss, "vid2", [0,1,2], 1001, canary)
already2, writers2 = self.allocate(ss, "vid2", [0,1,2], 1001, canary)
self.failUnlessEqual(len(writers2), 1)
self.failUnlessEqual(len(ss._active_writers), 4)
# we abandon the first set, so their provisional allocation should be
# returned
# XXX okay, so the weak-key-dictionary in storage-server is
# basically making an interface to the storage-server that is
# "whenever I drop my object AND the garbage-collector removes
# it, *then* that thing is no longer writing"..? ... yuuuuck.
del already
del writers
gc.collect() # for pypy's benefit
for x in writers.values():
x.remote_close()
self.failUnlessEqual(len(ss._active_writers), 1)
# now we have a provisional allocation of 1001 bytes
@ -574,7 +569,6 @@ class Server(unittest.TestCase):
del already2
del writers2
del bw
gc.collect() # for pypy's benefit
self.failUnlessEqual(len(ss._active_writers), 0)
# this also changes the amount reported as available by call_get_disk_stats
@ -582,12 +576,12 @@ class Server(unittest.TestCase):
# now there should be ALLOCATED=1001+12+72=1085 bytes allocated, and
# 5000-1085=3915 free, therefore we can fit 39 100byte shares
already3,writers3 = self.allocate(ss,"vid3", range(100), 100, canary)
already3, writers3 = self.allocate(ss,"vid3", range(100), 100, canary)
self.failUnlessEqual(len(writers3), 39)
self.failUnlessEqual(len(ss._active_writers), 39)
del already3
del writers3
for x in writers3.values():
x._disconnected()
self.failUnlessEqual(len(ss._active_writers), 0)
ss.disownServiceParent()
del ss