ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-07 11:50:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update nurls too

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2023-07-10 16:38:58 -04:00
parent e764a5603a
commit 601c512219
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/storage_client.py
View File

@ -331,9 +331,11 @@ class StorageFarmBroker(service.MultiService):
) )
if self._should_we_use_http(self.node_config, server["ann"]): if self._should_we_use_http(self.node_config, server["ann"]):
initial_server = http_server_factory(server["ann"][ANONYMOUS_STORAGE_NURLS]) nurls = server["ann"][ANONYMOUS_STORAGE_NURLS]
initial_server = http_server_factory(nurls)
else: else:
handler_overrides = server.get("connections", {}) handler_overrides = server.get("connections", {})
nurls = []
initial_server = NativeStorageServer( initial_server = NativeStorageServer(
server_id, server_id,
server["ann"], server["ann"],
@ -344,7 +346,7 @@ class StorageFarmBroker(service.MultiService):
gm_verifier, gm_verifier,
) )
s = UpgradingStorageServer(initial_server, http_server_factory) s = UpgradingStorageServer(initial_server, http_server_factory, nurls)
s.on_status_changed(lambda _: self._got_connection()) s.on_status_changed(lambda _: self._got_connection())
return s return s
@ -1315,11 +1317,12 @@ class UpgradingStorageServer(service.MultiService):
def __init__( def __init__(
self, self,
original_server: Union[NativeStorageServer,HTTPNativeStorageServer], original_server: Union[NativeStorageServer,HTTPNativeStorageServer],
http_server_factory: Callable[[list[str]],HTTPNativeStorageServer] http_server_factory: Callable[[list[str]],HTTPNativeStorageServer],
nurls: list[str],
): ):
service.MultiService.__init__(self) service.MultiService.__init__(self)
self._http_server_factory = http_server_factory self._http_server_factory = http_server_factory
self._nurls : list[str] = [] # might become an argument if we end up supporting upgradable HTTPNativeStorageServer self._nurls = nurls
self._switch_current_server(original_server) self._switch_current_server(original_server)
def _switch_current_server(self, server: Union[NativeStorageServer,HTTPNativeStorageServer]) -> None: def _switch_current_server(self, server: Union[NativeStorageServer,HTTPNativeStorageServer]) -> None:
@ -1352,6 +1355,7 @@ class UpgradingStorageServer(service.MultiService):
# Note this could cause reentrancy bugs, as server.stopService() is # Note this could cause reentrancy bugs, as server.stopService() is
# called in the middle of a callback from the server. # called in the middle of a callback from the server.
self._nurls = nurls
self._switch_current_server(self._http_server_factory(nurls)) self._switch_current_server(self._http_server_factory(nurls))
def __getattr__(self, attr): def __getattr__(self, attr):