use set instead of WeakKeyDictionary

src/allmydata/storage/server.py

@@ -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

src/allmydata/test/test_storage.py

@@ -555,13 +555,8 @@ class Server(unittest.TestCase):
         # 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
@@ -586,8 +580,8 @@ class Server(unittest.TestCase):
         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