From: Brian Warner Date: Fri, 22 May 2009 00:46:32 +0000 (-0700) Subject: switch to using RemoteException instead of 'wrapped' RemoteReferences. Should fix... X-Git-Url: https://git.rkrishnan.org/pf/content/...?a=commitdiff_plain;h=1863aee0aae1cc0218c5f1b3cd4c08f5d4bcda19;p=tahoe-lafs%2Ftahoe-lafs.git switch to using RemoteException instead of 'wrapped' RemoteReferences. Should fix #653, the rref-EQ problem --- diff --git a/src/allmydata/immutable/checker.py b/src/allmydata/immutable/checker.py index 88d7b171..c565bc30 100644 --- a/src/allmydata/immutable/checker.py +++ b/src/allmydata/immutable/checker.py @@ -1,11 +1,11 @@ -from foolscap.api import DeadReferenceError +from foolscap.api import DeadReferenceError, RemoteException from twisted.internet import defer from allmydata import hashtree from allmydata.check_results import CheckResults from allmydata.immutable import download from allmydata.uri import CHKFileVerifierURI from allmydata.util.assertutil import precondition -from allmydata.util import base32, deferredutil, dictutil, log, rrefutil +from allmydata.util import base32, deferredutil, dictutil, log from allmydata.util.hashutil import file_renewal_secret_hash, \ file_cancel_secret_hash, bucket_renewal_secret_hash, \ bucket_cancel_secret_hash @@ -38,7 +38,6 @@ class Checker(log.PrefixingLogMixin): assert precondition(isinstance(servers, (set, frozenset)), servers) for (serverid, serverrref) in servers: assert precondition(isinstance(serverid, str)) - assert precondition(isinstance(serverrref, rrefutil.WrappedRemoteReference), serverrref) prefix = "%s" % base32.b2a_l(verifycap.storage_index[:8], 60) log.PrefixingLogMixin.__init__(self, facility="tahoe.immutable.checker", prefix=prefix) @@ -84,19 +83,24 @@ class Checker(log.PrefixingLogMixin): def _done(res): [(get_success, get_result), (addlease_success, addlease_result)] = res - if (not addlease_success and - not rrefutil.check_remote(addlease_result, IndexError)): - # tahoe=1.3.0 raised IndexError on non-existant buckets, - # which we ignore. But report others, including the - # unfortunate internal KeyError bug that <1.3.0 had. - return addlease_result # propagate error - return get_result + # ignore remote IndexError on the add_lease call. Propagate + # local errors and remote non-IndexErrors + if addlease_success: + return get_result + if not addlease_result.check(RemoteException): + # Propagate local errors + return addlease_result + if addlease_result.value.failure.check(IndexError): + # tahoe=1.3.0 raised IndexError on non-existant + # buckets, which we ignore + return get_result + # propagate remote errors that aren't IndexError, including + # the unfortunate internal KeyError bug that <1.3.0 had. + return addlease_result dl.addCallback(_done) d = dl def _wrap_results(res): - for k in res: - res[k] = rrefutil.WrappedRemoteReference(res[k]) return (res, serverid, True) def _trap_errs(f): @@ -133,27 +137,24 @@ class Checker(log.PrefixingLogMixin): d = veup.start() def _errb(f): - # Okay, we didn't succeed at fetching and verifying all the - # blocks of this share. Now we need to handle different reasons - # for failure differently. If the failure isn't one of the - # following four classes then it will get re-raised. - failtype = f.trap(DeadReferenceError, - rrefutil.ServerFailure, - layout.LayoutInvalid, - layout.RidiculouslyLargeURIExtensionBlock, - layout.ShareVersionIncompatible, - download.BadOrMissingHash, - download.BadURIExtensionHashValue) + # We didn't succeed at fetching and verifying all the blocks of + # this share. Handle each reason for failure differently. if f.check(DeadReferenceError): return (False, sharenum, 'disconnect') - elif f.check(rrefutil.ServerFailure): + elif f.check(RemoteException): return (False, sharenum, 'failure') elif f.check(layout.ShareVersionIncompatible): return (False, sharenum, 'incompatible') - else: + elif f.check(layout.LayoutInvalid, + layout.RidiculouslyLargeURIExtensionBlock, + download.BadOrMissingHash, + download.BadURIExtensionHashValue): return (False, sharenum, 'corrupt') + # if it wasn't one of those reasons, re-raise the error + return f + def _got_ueb(vup): self._share_hash_tree = hashtree.IncompleteHashTree(self._verifycap.total_shares) self._share_hash_tree.set_hashes({0: vup.share_root_hash}) @@ -238,7 +239,7 @@ class Checker(log.PrefixingLogMixin): return dl def _err(f): - f.trap(rrefutil.ServerFailure) + f.trap(RemoteException, DeadReferenceError) return (set(), serverid, set(), set(), False) d.addCallbacks(_got_buckets, _err) diff --git a/src/allmydata/immutable/download.py b/src/allmydata/immutable/download.py index 2d544ad6..326bd572 100644 --- a/src/allmydata/immutable/download.py +++ b/src/allmydata/immutable/download.py @@ -3,11 +3,10 @@ from zope.interface import implements from twisted.internet import defer from twisted.internet.interfaces import IPushProducer, IConsumer from twisted.application import service -from foolscap.api import DeadReferenceError, eventually +from foolscap.api import DeadReferenceError, RemoteException, eventually from allmydata.util import base32, deferredutil, hashutil, log, mathutil from allmydata.util.assertutil import _assert, precondition -from allmydata.util.rrefutil import ServerFailure from allmydata import codec, hashtree, uri from allmydata.interfaces import IDownloadTarget, IDownloader, IFileURI, IVerifierURI, \ IDownloadStatus, IDownloadResults, IValidatedThingProxy, NotEnoughSharesError, \ @@ -82,11 +81,13 @@ class ValidatedThingObtainer: self._log_id = log_id def _bad(self, f, validatedthingproxy): - failtype = f.trap(ServerFailure, IntegrityCheckReject, layout.LayoutInvalid, layout.ShareVersionIncompatible, DeadReferenceError) + failtype = f.trap(RemoteException, DeadReferenceError, + IntegrityCheckReject, layout.LayoutInvalid, + layout.ShareVersionIncompatible) level = log.WEIRD if f.check(DeadReferenceError): level = log.UNUSUAL - elif f.check(ServerFailure): + elif f.check(RemoteException): level = log.WEIRD else: level = log.SCARY @@ -476,8 +477,10 @@ class BlockDownloader(log.PrefixingLogMixin): self.parent.hold_block(self.blocknum, data) def _got_block_error(self, f): - failtype = f.trap(ServerFailure, IntegrityCheckReject, layout.LayoutInvalid, layout.ShareVersionIncompatible) - if f.check(ServerFailure): + failtype = f.trap(RemoteException, DeadReferenceError, + IntegrityCheckReject, + layout.LayoutInvalid, layout.ShareVersionIncompatible) + if f.check(RemoteException, DeadReferenceError): level = log.UNUSUAL else: level = log.WEIRD diff --git a/src/allmydata/immutable/upload.py b/src/allmydata/immutable/upload.py index d7a4d7ad..a8b270eb 100644 --- a/src/allmydata/immutable/upload.py +++ b/src/allmydata/immutable/upload.py @@ -14,7 +14,7 @@ from allmydata.storage.server import si_b2a from allmydata.immutable import encode from allmydata.util import base32, dictutil, idlib, log, mathutil from allmydata.util.assertutil import precondition -from allmydata.util.rrefutil import get_versioned_remote_reference +from allmydata.util.rrefutil import add_version_to_remote_reference from allmydata.interfaces import IUploadable, IUploader, IUploadResults, \ IEncryptedUploadable, RIEncryptedUploadable, IUploadStatus, \ NotEnoughSharesError, InsufficientVersionError, NoServersError @@ -1227,7 +1227,7 @@ class Uploader(service.MultiService, log.PrefixingLogMixin): { }, "application-version": "unknown: no get_version()", } - d = get_versioned_remote_reference(helper, default) + d = add_version_to_remote_reference(helper, default) d.addCallback(self._got_versioned_helper) def _got_versioned_helper(self, helper): diff --git a/src/allmydata/introducer/client.py b/src/allmydata/introducer/client.py index bd45f6e8..db09c7eb 100644 --- a/src/allmydata/introducer/client.py +++ b/src/allmydata/introducer/client.py @@ -8,7 +8,7 @@ from allmydata.interfaces import InsufficientVersionError from allmydata.introducer.interfaces import RIIntroducerSubscriberClient, \ IIntroducerClient from allmydata.util import log, idlib -from allmydata.util.rrefutil import get_versioned_remote_reference +from allmydata.util.rrefutil import add_version_to_remote_reference from allmydata.introducer.common import make_index @@ -78,14 +78,14 @@ class RemoteServiceConnector: self.log("got connection to %s, getting versions" % self._nodeid_s) default = self.VERSION_DEFAULTS.get(self.service_name, {}) - d = get_versioned_remote_reference(rref, default) + d = add_version_to_remote_reference(rref, default) d.addCallback(self._got_versioned_service) def _got_versioned_service(self, rref): self.log("connected to %s, version %s" % (self._nodeid_s, rref.version)) self.last_connect_time = time.time() - self.remote_host = rref.rref.tracker.broker.transport.getPeer() + self.remote_host = rref.tracker.broker.transport.getPeer() self.rref = rref @@ -156,7 +156,7 @@ class IntroducerClient(service.Service, Referenceable): { }, "application-version": "unknown: no get_version()", } - d = get_versioned_remote_reference(publisher, default) + d = add_version_to_remote_reference(publisher, default) d.addCallback(self._got_versioned_introducer) d.addErrback(self._got_error) diff --git a/src/allmydata/key_generator.py b/src/allmydata/key_generator.py index 7d0ecdb7..89c8baff 100644 --- a/src/allmydata/key_generator.py +++ b/src/allmydata/key_generator.py @@ -80,6 +80,7 @@ class KeyGeneratorService(service.MultiService): service.MultiService.__init__(self) self.basedir = basedir self.tub = Tub(certFile=os.path.join(self.basedir, 'key_generator.pem')) + self.tub.setOption("expose-remote-exception-types", False) self.tub.setServiceParent(self) self.key_generator = KeyGenerator(default_key_size=default_key_size) self.key_generator.setServiceParent(self) diff --git a/src/allmydata/mutable/servermap.py b/src/allmydata/mutable/servermap.py index 12cf4ff0..592e600e 100644 --- a/src/allmydata/mutable/servermap.py +++ b/src/allmydata/mutable/servermap.py @@ -4,8 +4,8 @@ from zope.interface import implements from itertools import count from twisted.internet import defer from twisted.python import failure -from foolscap.api import DeadReferenceError, eventually -from allmydata.util import base32, hashutil, idlib, log, rrefutil +from foolscap.api import DeadReferenceError, RemoteException, eventually +from allmydata.util import base32, hashutil, idlib, log from allmydata.storage.server import si_b2a from allmydata.interfaces import IServermapUpdaterStatus from pycryptopp.publickey import rsa @@ -546,13 +546,20 @@ class ServermapUpdater: def _done(res): [(readv_success, readv_result), (addlease_success, addlease_result)] = res - if (not addlease_success and - not rrefutil.check_remote(addlease_result, IndexError)): - # tahoe 1.3.0 raised IndexError on non-existant buckets, - # which we ignore. Unfortunately tahoe <1.3.0 had a bug - # and raised KeyError, which we report. - return addlease_result # propagate error - return readv_result + # ignore remote IndexError on the add_lease call. Propagate + # local errors and remote non-IndexErrors + if addlease_success: + return readv_result + if not addlease_result.check(RemoteException): + # Propagate local errors + return addlease_result + if addlease_result.value.failure.check(IndexError): + # tahoe=1.3.0 raised IndexError on non-existant + # buckets, which we ignore + return readv_result + # propagate remote errors that aren't IndexError, including + # the unfortunate internal KeyError bug that <1.3.0 had. + return addlease_result dl.addCallback(_done) return dl return d diff --git a/src/allmydata/node.py b/src/allmydata/node.py index b582d923..582c590f 100644 --- a/src/allmydata/node.py +++ b/src/allmydata/node.py @@ -141,6 +141,7 @@ class Node(service.MultiService): self.tub = Tub(certFile=certfile) self.tub.setOption("logLocalFailures", True) self.tub.setOption("logRemoteFailures", True) + self.tub.setOption("expose-remote-exception-types", False) # see #521 for a discussion of how to pick these timeout values. keepalive_timeout_s = self.get_config("node", "timeout.keepalive", "") diff --git a/src/allmydata/stats.py b/src/allmydata/stats.py index 685aa3d0..2ae63dbf 100644 --- a/src/allmydata/stats.py +++ b/src/allmydata/stats.py @@ -285,6 +285,7 @@ class StatsGathererService(service.MultiService): self.tub.setServiceParent(self) self.tub.setOption("logLocalFailures", True) self.tub.setOption("logRemoteFailures", True) + self.tub.setOption("expose-remote-exception-types", False) self.stats_gatherer = PickleStatsGatherer(self.basedir, verbose) self.stats_gatherer.setServiceParent(self) diff --git a/src/allmydata/test/check_memory.py b/src/allmydata/test/check_memory.py index bfc6b91a..40cfa590 100644 --- a/src/allmydata/test/check_memory.py +++ b/src/allmydata/test/check_memory.py @@ -74,6 +74,7 @@ class SystemFramework(pollmixin.PollMixin): self.sparent.startService() self.proc = None self.tub = Tub() + self.tub.setOption("expose-remote-exception-types", False) self.tub.setServiceParent(self.sparent) self.mode = mode self.failed = False diff --git a/src/allmydata/test/check_speed.py b/src/allmydata/test/check_speed.py index f8d0fc1d..d709f048 100644 --- a/src/allmydata/test/check_speed.py +++ b/src/allmydata/test/check_speed.py @@ -48,6 +48,7 @@ class SpeedTest: def setUp(self): self.base_service.startService() self.tub = Tub() + self.tub.setOption("expose-remote-exception-types", False) self.tub.setServiceParent(self.base_service) d = self.tub.getReference(self.control_furl) def _gotref(rref): diff --git a/src/allmydata/test/no_network.py b/src/allmydata/test/no_network.py index d417f60a..5808b720 100644 --- a/src/allmydata/test/no_network.py +++ b/src/allmydata/test/no_network.py @@ -17,12 +17,13 @@ import os.path import sha from twisted.application import service from twisted.internet import reactor -from foolscap.api import Referenceable, fireEventually +from twisted.python.failure import Failure +from foolscap.api import Referenceable, fireEventually, RemoteException from base64 import b32encode from allmydata import uri as tahoe_uri from allmydata.client import Client from allmydata.storage.server import StorageServer, storage_index_to_dir -from allmydata.util import fileutil, idlib, hashutil, rrefutil +from allmydata.util import fileutil, idlib, hashutil from allmydata.introducer.client import RemoteServiceConnector from allmydata.test.common_web import HTTPClientGETFactory @@ -61,6 +62,9 @@ class LocalWrapper: return meth(*args, **kwargs) d = fireEventually() d.addCallback(lambda res: _call()) + def _wrap_exception(f): + return Failure(RemoteException(f)) + d.addErrback(_wrap_exception) def _return_membrane(res): # rather than complete the difficult task of building a # fully-general Membrane (which would locate all Referenceable @@ -88,20 +92,17 @@ class LocalWrapper: del self.disconnectors[marker] def wrap(original, service_name): - # The code in immutable.checker insists upon asserting the truth of - # isinstance(rref, rrefutil.WrappedRemoteReference). Much of the - # upload/download code uses rref.version (which normally comes from - # rrefutil.VersionedRemoteReference). To avoid using a network, we want a - # LocalWrapper here. Try to satisfy all these constraints at the same - # time. - local = LocalWrapper(original) - wrapped = rrefutil.WrappedRemoteReference(local) + # Much of the upload/download code uses rref.version (which normally + # comes from rrefutil.add_version_to_remote_reference). To avoid using a + # network, we want a LocalWrapper here. Try to satisfy all these + # constraints at the same time. + wrapper = LocalWrapper(original) try: version = original.remote_get_version() except AttributeError: version = RemoteServiceConnector.VERSION_DEFAULTS[service_name] - wrapped.version = version - return wrapped + wrapper.version = version + return wrapper class NoNetworkClient(Client): diff --git a/src/allmydata/test/test_helper.py b/src/allmydata/test/test_helper.py index e9cd0c37..ea448698 100644 --- a/src/allmydata/test/test_helper.py +++ b/src/allmydata/test/test_helper.py @@ -95,6 +95,7 @@ class AssistedUpload(unittest.TestCase): self.s.startService() self.tub = t = Tub() + t.setOption("expose-remote-exception-types", False) t.setServiceParent(self.s) self.s.tub = t # we never actually use this for network traffic, so it can use a diff --git a/src/allmydata/test/test_introducer.py b/src/allmydata/test/test_introducer.py index 6650bf27..535fab77 100644 --- a/src/allmydata/test/test_introducer.py +++ b/src/allmydata/test/test_introducer.py @@ -84,6 +84,7 @@ class SystemTestMixin(ServiceMixin, pollmixin.PollMixin): self.central_tub = tub = Tub() #tub.setOption("logLocalFailures", True) #tub.setOption("logRemoteFailures", True) + tub.setOption("expose-remote-exception-types", False) tub.setServiceParent(self.parent) l = tub.listenOn("tcp:0") portnum = l.getPortnum() @@ -116,6 +117,7 @@ class SystemTest(SystemTestMixin, unittest.TestCase): tub = Tub() #tub.setOption("logLocalFailures", True) #tub.setOption("logRemoteFailures", True) + tub.setOption("expose-remote-exception-types", False) tub.setServiceParent(self.parent) l = tub.listenOn("tcp:0") portnum = l.getPortnum() @@ -249,6 +251,7 @@ class NonV1Server(SystemTestMixin, unittest.TestCase): self.introducer_furl = self.central_tub.registerReference(i) tub = Tub() + tub.setOption("expose-remote-exception-types", False) tub.setServiceParent(self.parent) l = tub.listenOn("tcp:0") portnum = l.getPortnum() diff --git a/src/allmydata/test/test_keygen.py b/src/allmydata/test/test_keygen.py index 34282b58..45fbaea2 100644 --- a/src/allmydata/test/test_keygen.py +++ b/src/allmydata/test/test_keygen.py @@ -22,6 +22,7 @@ class KeyGenService(unittest.TestCase, pollmixin.PollMixin): self.parent.startService() self.tub = t = Tub() + t.setOption("expose-remote-exception-types", False) t.setServiceParent(self.parent) t.listenOn("tcp:0") t.setLocationAutomatically() diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py index 16a63f04..2ae2667e 100644 --- a/src/allmydata/test/test_util.py +++ b/src/allmydata/test/test_util.py @@ -11,8 +11,7 @@ from twisted.python import log from allmydata.util import base32, idlib, humanreadable, mathutil, hashutil from allmydata.util import assertutil, fileutil, deferredutil, abbreviate from allmydata.util import limiter, time_format, pollmixin, cachedir -from allmydata.util import statistics, dictutil, rrefutil, pipeline -from allmydata.util.rrefutil import ServerFailure +from allmydata.util import statistics, dictutil, pipeline class Base32(unittest.TestCase): def test_b2a_matches_Pythons(self): @@ -1212,96 +1211,6 @@ class DictUtil(unittest.TestCase): self.failUnlessEqual(x, "b") self.failUnlessEqual(d.items(), [("c", 1), ("a", 3)]) -class FakeRemoteReference: - def callRemote(self, methname, *args, **kwargs): - return defer.maybeDeferred(self.oops) - def oops(self): - raise IndexError("remote missing key") - -class RemoteFailures(unittest.TestCase): - def test_check(self): - check_local = rrefutil.check_local - check_remote = rrefutil.check_remote - try: - raise IndexError("local missing key") - except IndexError: - localf = Failure() - - self.failUnlessEqual(localf.check(IndexError, KeyError), IndexError) - self.failUnlessEqual(localf.check(ValueError, KeyError), None) - self.failUnlessEqual(localf.check(ServerFailure), None) - self.failUnlessEqual(check_local(localf, IndexError, KeyError), - IndexError) - self.failUnlessEqual(check_local(localf, ValueError, KeyError), None) - self.failUnlessEqual(check_remote(localf, IndexError, KeyError), None) - self.failUnlessEqual(check_remote(localf, ValueError, KeyError), None) - - frr = FakeRemoteReference() - wrr = rrefutil.WrappedRemoteReference(frr) - d = wrr.callRemote("oops") - def _check(f): - self.failUnlessEqual(f.check(IndexError, KeyError), None) - self.failUnlessEqual(f.check(ServerFailure, KeyError), - ServerFailure) - self.failUnlessEqual(check_remote(f, IndexError, KeyError), - IndexError) - self.failUnlessEqual(check_remote(f, ValueError, KeyError), None) - self.failUnlessEqual(check_local(f, IndexError, KeyError), None) - self.failUnlessEqual(check_local(f, ValueError, KeyError), None) - d.addErrback(_check) - return d - - def test_is_remote(self): - try: - raise IndexError("local missing key") - except IndexError: - localf = Failure() - self.failIf(rrefutil.is_remote(localf)) - self.failUnless(rrefutil.is_local(localf)) - - frr = FakeRemoteReference() - wrr = rrefutil.WrappedRemoteReference(frr) - d = wrr.callRemote("oops") - def _check(f): - self.failUnless(rrefutil.is_remote(f)) - self.failIf(rrefutil.is_local(f)) - d.addErrback(_check) - return d - - def test_trap(self): - try: - raise IndexError("local missing key") - except IndexError: - localf = Failure() - - self.failUnlessRaises(Failure, localf.trap, ValueError, KeyError) - self.failUnlessRaises(Failure, localf.trap, ServerFailure) - self.failUnlessEqual(localf.trap(IndexError, KeyError), IndexError) - self.failUnlessEqual(rrefutil.trap_local(localf, IndexError, KeyError), - IndexError) - self.failUnlessRaises(Failure, - rrefutil.trap_remote, localf, ValueError, KeyError) - - frr = FakeRemoteReference() - wrr = rrefutil.WrappedRemoteReference(frr) - d = wrr.callRemote("oops") - def _check(f): - self.failUnlessRaises(Failure, - f.trap, ValueError, KeyError) - self.failUnlessRaises(Failure, - f.trap, IndexError) - self.failUnlessEqual(f.trap(ServerFailure), ServerFailure) - self.failUnlessRaises(Failure, - rrefutil.trap_remote, f, ValueError, KeyError) - self.failUnlessEqual(rrefutil.trap_remote(f, IndexError, KeyError), - IndexError) - self.failUnlessRaises(Failure, - rrefutil.trap_local, f, ValueError, KeyError) - self.failUnlessRaises(Failure, - rrefutil.trap_local, f, IndexError) - d.addErrback(_check) - return d - class Pipeline(unittest.TestCase): def pause(self, *args, **kwargs): d = defer.Deferred() @@ -1444,7 +1353,6 @@ class Pipeline(unittest.TestCase): self.failUnless(f.check(pipeline.PipelineError)) f2 = f.value.error self.failUnless(f2.check(ValueError)) - def test_errors2(self): self.calls = [] diff --git a/src/allmydata/util/rrefutil.py b/src/allmydata/util/rrefutil.py index 99e10774..097e732a 100644 --- a/src/allmydata/util/rrefutil.py +++ b/src/allmydata/util/rrefutil.py @@ -1,87 +1,19 @@ -import exceptions -from foolscap.api import Violation +from foolscap.api import Violation, RemoteException -class ServerFailure(exceptions.Exception): - # If the server returns a Failure instead of the normal response to a - # protocol, then this exception will be raised, with the Failure that the - # server returned as its .remote_failure attribute. - def __init__(self, remote_failure): - self.remote_failure = remote_failure - def __repr__(self): - return repr(self.remote_failure) - def __str__(self): - return str(self.remote_failure) - -def is_remote(f): - if isinstance(f.value, ServerFailure): - return True - return False - -def is_local(f): - return not is_remote(f) - -def check_remote(f, *errorTypes): - if is_remote(f): - return f.value.remote_failure.check(*errorTypes) - return None - -def check_local(f, *errorTypes): - if is_local(f): - return f.check(*errorTypes) - return None - -def trap_remote(f, *errorTypes): - if is_remote(f): - return f.value.remote_failure.trap(*errorTypes) - raise f - -def trap_local(f, *errorTypes): - if is_local(f): - return f.trap(*errorTypes) - raise f - -def _wrap_server_failure(f): - raise ServerFailure(f) - -class WrappedRemoteReference(object): - """I intercept any errback from the server and wrap it in a - ServerFailure.""" - - def __init__(self, original): - self.rref = original - - def callRemote(self, *args, **kwargs): - d = self.rref.callRemote(*args, **kwargs) - d.addErrback(_wrap_server_failure) - return d - - def callRemoteOnly(self, *args, **kwargs): - return self.rref.callRemoteOnly(*args, **kwargs) - - def notifyOnDisconnect(self, *args, **kwargs): - return self.rref.notifyOnDisconnect(*args, **kwargs) - - def dontNotifyOnDisconnect(self, *args, **kwargs): - return self.rref.dontNotifyOnDisconnect(*args, **kwargs) - -class VersionedRemoteReference(WrappedRemoteReference): - """I wrap a RemoteReference, and add a .version attribute. I also - intercept any errback from the server and wrap it in a ServerFailure.""" - - def __init__(self, original, version): - WrappedRemoteReference.__init__(self, original) - self.version = version - -def get_versioned_remote_reference(rref, default): - """I return a Deferred that fires with a VersionedRemoteReference""" +def add_version_to_remote_reference(rref, default): + """I try to add a .version attribute to the given RemoteReference. I call + the remote get_version() method to learn its version. I'll add the + default value if the remote side doesn't appear to have a get_version() + method.""" d = rref.callRemote("get_version") - def _no_get_version(f): - f.trap(Violation, AttributeError) - return default - d.addErrback(_no_get_version) def _got_version(version): - return VersionedRemoteReference(rref, version) - d.addCallback(_got_version) + rref.version = version + return rref + def _no_get_version(f): + f.trap(Violation, RemoteException) + rref.version = default + return rref + d.addCallbacks(_got_version, _no_get_version) return d