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

Parameterize the callRemote scheduling

Browse Source
This commit is contained in:
Jean-Paul Calderone 2020-10-14 11:08:40 -04:00
parent cc8c9c0bdf
commit b0159a898e
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/allmydata/test/no_network.py
View File

@ -26,13 +26,16 @@ if PY2:
from past.builtins import unicode from past.builtins import unicode
import os import os
from base64 import b32encode
from functools import (
partial,
)
from zope.interface import implementer from zope.interface import implementer
from twisted.application import service from twisted.application import service
from twisted.internet import defer from twisted.internet import defer
from twisted.python.failure import Failure from twisted.python.failure import Failure
from twisted.web.error import Error from twisted.web.error import Error
from foolscap.api import Referenceable, fireEventually, RemoteException from foolscap.api import Referenceable, fireEventually, RemoteException
from base64 import b32encode
import treq import treq
from allmydata.util.assertutil import _assert from allmydata.util.assertutil import _assert
@ -59,14 +62,24 @@ class IntentionalError(Exception):
class Marker(object): class Marker(object):
pass pass
fireNow = partial(defer.succeed, None)
class LocalWrapper(object): class LocalWrapper(object):
def __init__(self, original): def __init__(self, original, fireEventually=fireEventually):
"""
:param Callable[[], Deferred[None]] fireEventually: Get a Deferred
that will fire at some point. This is used to control when
``callRemote`` calls the remote method. The default value allows
the reactor to iterate before the call happens. Use ``fireNow``
to call the remote method synchronously.
"""
self.original = original self.original = original
self.broken = False self.broken = False
self.hung_until = None self.hung_until = None
self.post_call_notifier = None self.post_call_notifier = None
self.disconnectors = {} self.disconnectors = {}
self.counter_by_methname = {} self.counter_by_methname = {}
self._fireEventually = fireEventually
def _clear_counters(self): def _clear_counters(self):
self.counter_by_methname = {} self.counter_by_methname = {}
@ -82,7 +95,7 @@ class LocalWrapper(object):
# selected return values. # selected return values.
def wrap(a): def wrap(a):
if isinstance(a, Referenceable): if isinstance(a, Referenceable):
return LocalWrapper(a) return self._wrap(a)
else: else:
return a return a
args = tuple([wrap(a) for a in args]) args = tuple([wrap(a) for a in args])
@ -110,7 +123,7 @@ class LocalWrapper(object):
return d2 return d2
return _really_call() return _really_call()
d = fireEventually() d = self._fireEventually()
d.addCallback(lambda res: _call()) d.addCallback(lambda res: _call())
def _wrap_exception(f): def _wrap_exception(f):
return Failure(RemoteException(f)) return Failure(RemoteException(f))
@ -124,10 +137,10 @@ class LocalWrapper(object):
if methname == "allocate_buckets": if methname == "allocate_buckets":
(alreadygot, allocated) = res (alreadygot, allocated) = res
for shnum in allocated: for shnum in allocated:
allocated[shnum] = LocalWrapper(allocated[shnum]) allocated[shnum] = self._wrap(allocated[shnum])
if methname == "get_buckets": if methname == "get_buckets":
for shnum in res: for shnum in res:
res[shnum] = LocalWrapper(res[shnum]) res[shnum] = self._wrap(res[shnum])
return res return res
d.addCallback(_return_membrane) d.addCallback(_return_membrane)
if self.post_call_notifier: if self.post_call_notifier:
@ -141,6 +154,10 @@ class LocalWrapper(object):
def dontNotifyOnDisconnect(self, marker): def dontNotifyOnDisconnect(self, marker):
del self.disconnectors[marker] del self.disconnectors[marker]
def _wrap(self, value):
return LocalWrapper(value, self._fireEventually)
def wrap_storage_server(original): def wrap_storage_server(original):
# Much of the upload/download code uses rref.version (which normally # Much of the upload/download code uses rref.version (which normally
# comes from rrefutil.add_version_to_remote_reference). To avoid using a # comes from rrefutil.add_version_to_remote_reference). To avoid using a