Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
524961979d |
No files matched your search
@@ -87,14 +87,14 @@ class ClientSession(BaseClientSession):
|
||||
async def ensure_session(self):
|
||||
# Handles reconnecting and maintaining a session alive
|
||||
# TODO: change to 'ping' on newer protocol (above 1.2)
|
||||
retry_delay = default_delay = 1.0
|
||||
retry_delay = default_delay = 300.0
|
||||
while True:
|
||||
try:
|
||||
if self.is_closing():
|
||||
await self.create_connection(self.timeout)
|
||||
await self.ensure_server_version()
|
||||
self._on_connect_cb()
|
||||
elif (perf_counter() - self.last_send) > self.max_seconds_idle or self.response_time is None:
|
||||
if (perf_counter() - self.last_send) > self.max_seconds_idle or self.response_time is None:
|
||||
await self.ensure_server_version()
|
||||
retry_delay = default_delay
|
||||
except RPCError as e:
|
||||
@@ -107,7 +107,6 @@ class ClientSession(BaseClientSession):
|
||||
log.debug("Wallet server has an incompatible version, retrying in 1h: %s:%d", *self.server)
|
||||
except (asyncio.TimeoutError, OSError):
|
||||
await self.close()
|
||||
retry_delay = min(60, retry_delay * 2)
|
||||
log.debug("Wallet server timeout (retry in %s seconds): %s:%d", retry_delay, *self.server)
|
||||
try:
|
||||
await asyncio.wait_for(self.trigger_urgent_reconnect.wait(), timeout=retry_delay)
|
||||
|
||||
@@ -919,9 +919,12 @@ class LBRYElectrumX(SessionBase):
|
||||
metrics.start()
|
||||
cache = self.session_mgr.search_cache[query_name]
|
||||
cache_key = str(kwargs)
|
||||
if cache_key not in cache:
|
||||
cache[cache_key] = ResultCacheItem()
|
||||
cache_item = cache[cache_key]
|
||||
cache_item = cache.get(cache_key)
|
||||
if cache_item is None:
|
||||
cache_item = cache[cache_key] = ResultCacheItem()
|
||||
elif cache_item.result is not None:
|
||||
metrics.cache_response()
|
||||
return cache_item.result
|
||||
async with cache_item.lock:
|
||||
if cache_item.result is None:
|
||||
cache_item.result = await self.run_in_executor(
|
||||
|
||||
@@ -8,7 +8,6 @@ from unittest.mock import Mock
|
||||
from lbry.wallet.network import Network
|
||||
from lbry.wallet.orchstr8.node import SPVNode
|
||||
from lbry.wallet.rpc import RPCSession
|
||||
from lbry.wallet.rpc import RPCError
|
||||
from lbry.testcase import IntegrationTestCase, AsyncioTestCase
|
||||
|
||||
|
||||
@@ -141,16 +140,12 @@ class ReconnectTests(IntegrationTestCase):
|
||||
|
||||
class ServerPickingTestCase(AsyncioTestCase):
|
||||
|
||||
async def _make_fake_server(self, latency=1.0, port=1, raise_version_rpc_error=False, return_versions=None):
|
||||
async def _make_fake_server(self, latency=1.0, port=1):
|
||||
# local fake server with artificial latency
|
||||
class FakeSession(RPCSession):
|
||||
async def handle_request(self, request):
|
||||
await asyncio.sleep(latency)
|
||||
if request.method == 'server.version':
|
||||
if raise_version_rpc_error:
|
||||
raise RPCError(1, 'derp')
|
||||
if return_versions:
|
||||
return return_versions
|
||||
return tuple(request.args)
|
||||
return {'height': 1}
|
||||
server = await self.loop.create_server(lambda: FakeSession(), host='127.0.0.1', port=port)
|
||||
@@ -160,10 +155,7 @@ class ServerPickingTestCase(AsyncioTestCase):
|
||||
async def _make_bad_server(self, port=42420):
|
||||
async def echo(reader, writer):
|
||||
while True:
|
||||
try:
|
||||
writer.write(await asyncio.wait_for(reader.read(), 1))
|
||||
except asyncio.TimeoutError:
|
||||
pass
|
||||
writer.write(await reader.read())
|
||||
server = await asyncio.start_server(echo, host='127.0.0.1', port=port)
|
||||
self.addCleanup(server.close)
|
||||
return '127.0.0.1', port
|
||||
@@ -177,9 +169,6 @@ class ServerPickingTestCase(AsyncioTestCase):
|
||||
('example.that.doesnt.resolve', 9000),
|
||||
await self._make_fake_server(latency=1.0, port=1340),
|
||||
await self._make_fake_server(latency=0.1, port=1337),
|
||||
await self._make_fake_server(latency=0, port=1338, raise_version_rpc_error=True),
|
||||
await self._make_fake_server(latency=0, port=1341, return_versions=('0.0.1', '2.0')),
|
||||
await self._make_fake_server(latency=0, port=1342, return_versions=('0.1', '2.0')),
|
||||
await self._make_fake_server(latency=0.4, port=1339),
|
||||
],
|
||||
'connect_timeout': 3
|
||||
|
||||
Reference in new issue
Block a user