Changeset 13b5e44 in trunk

Timestamp:

2010-07-19T07:54:26Z (15 years ago)

Author:

Zooko O'Whielacronx <zooko@…>

Branches:

master

Children:

255c545

Parents:

461f9464

Message:

immutable: fix bug in which preexisting_shares and merged were shallowly referencing the same sets
This bug had the effect of making uploads sometimes (rarely) appear to succeed when they had actually not distributed the shares well enough to achieve the desired servers-of-happiness level.

File:

• src/allmydata/util/happinessutil.py (modified) (3 diffs)

src/allmydata/util/happinessutil.py ¶

@@ -3 +3 @@
 reporting it in messages
 """
+
+from copy import deepcopy
 
 def failure_message(peer_count, k, happy, effective_happy):
@@ -61 +63 @@
     set of PeerTrackers, returning the resulting dict.
     """
+    # Since we mutate servermap, and are called outside of a
+    # context where it is okay to do that, make a copy of servermap and
+    # work with it.
+    servermap = deepcopy(servermap)
     if not used_peers:
         return servermap
@@ -67 +73 @@
     assert(isinstance(used_peers, set))
 
-    # Since we mutate servermap, and are called outside of a 
-    # context where it is okay to do that, make a copy of servermap and
-    # work with it.
-    servermap = servermap.copy()
     for peer in used_peers:
         for shnum in peer.buckets: