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

immutable/offloaded.py: reduce use of get_serverid() a bit more

Browse Source
This commit is contained in:
Brian Warner 2011-02-26 19:11:42 -07:00
parent 2f63d9b522
commit d9d55ad006
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/allmydata/immutable/offloaded.py
View File

@ -9,7 +9,7 @@ from allmydata.storage.server import si_b2a
from allmydata.immutable import upload
from allmydata.immutable.layout import ReadBucketProxy
from allmydata.util.assertutil import precondition
from allmydata.util import idlib, log, observer, fileutil, hashutil, dictutil
from allmydata.util import log, observer, fileutil, hashutil, dictutil
class NotEnoughWritersError(Exception):
@ -56,20 +56,20 @@ class CHKCheckerAndUEBFetcher:
for s in self._peer_getter(storage_index):
d = s.get_rref().callRemote("get_buckets", storage_index)
d.addCallbacks(self._got_response, self._got_error,
callbackArgs=(s.get_serverid(),))
callbackArgs=(s,))
dl.append(d)
return defer.DeferredList(dl)
def _got_response(self, buckets, peerid):
def _got_response(self, buckets, server):
# buckets is a dict: maps shum to an rref of the server who holds it
shnums_s = ",".join([str(shnum) for shnum in buckets])
self.log("got_response: [%s] has %d shares (%s)" %
(idlib.shortnodeid_b2a(peerid), len(buckets), shnums_s),
(server.name(), len(buckets), shnums_s),
level=log.NOISY)
self._found_shares.update(buckets.keys())
for k in buckets:
self._sharemap.add(k, peerid)
self._readers.update( [ (bucket, peerid)
self._sharemap.add(k, server.get_serverid())
self._readers.update( [ (bucket, server)
for bucket in buckets.values() ] )
def _got_error(self, f):
@ -84,8 +84,8 @@ class CHKCheckerAndUEBFetcher:
if not self._readers:
self.log("no readers, so no UEB", level=log.NOISY)
return
b,peerid = self._readers.pop()
rbp = ReadBucketProxy(b, peerid, si_b2a(self._storage_index))
b,server = self._readers.pop()
rbp = ReadBucketProxy(b, server.get_serverid(), si_b2a(self._storage_index))
d = rbp.get_uri_extension()
d.addCallback(self._got_uri_extension)
d.addErrback(self._ueb_error)