ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-03-10 14:34:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

happinessutil.py: server-vs-tracker cleanup

Browse Source
This commit is contained in:
Brian Warner 2011-02-26 19:11:11 -07:00
parent 43488b025c
commit 459b9d9e7c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/util/happinessutil.py
View File

@ -54,7 +54,7 @@ def shares_by_server(servermap):
ret.setdefault(peerid, set()).add(shareid)
return ret
def merge_peers(servermap, upload_servers=None):
def merge_peers(servermap, upload_trackers=None):
"""
I accept a dict of shareid -> set(peerid) mappings, and optionally a
set of PeerTrackers. If no set of PeerTrackers is provided, I return
@ -66,15 +66,15 @@ def merge_peers(servermap, upload_servers=None):
# context where it is okay to do that, make a copy of servermap and
# work with it.
servermap = deepcopy(servermap)
if not upload_servers:
if not upload_trackers:
return servermap
assert(isinstance(servermap, dict))
assert(isinstance(upload_servers, set))
assert(isinstance(upload_trackers, set))
for peer in upload_servers:
for shnum in peer.buckets:
servermap.setdefault(shnum, set()).add(peer.serverid)
for tracker in upload_trackers:
for shnum in tracker.buckets:
servermap.setdefault(shnum, set()).add(tracker.serverid)
return servermap
def servers_of_happiness(sharemap):