From 1edd06660634cc483a7a3e8b4629254caa9e0c66 Mon Sep 17 00:00:00 2001 From: Ian Paul Date: Mon, 25 Nov 2024 18:32:34 +0700 Subject: [PATCH] rm redundant cleanup task --- exo/networking/manual/manual_discovery.py | 16 ---------------- exo/networking/manual/test_manual_discovery.py | 3 ++- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/exo/networking/manual/manual_discovery.py b/exo/networking/manual/manual_discovery.py index ab2bb9e21..7544cd4d4 100644 --- a/exo/networking/manual/manual_discovery.py +++ b/exo/networking/manual/manual_discovery.py @@ -22,7 +22,6 @@ def __init__( self.create_peer_handle = create_peer_handle self.listen_task = None - self.cleanup_task = None self.known_peers: Dict[str, PeerHandle] = {} self._cached_peers: Dict[str, PeerConfig] = {} @@ -32,11 +31,9 @@ def __init__( async def start(self) -> None: self.listen_task = asyncio.create_task(self.task_find_peers_from_config()) - self.cleanup_task = asyncio.create_task(self.task_clean_up_peers_from_config()) async def stop(self) -> None: if self.listen_task: self.listen_task.cancel() - if self.cleanup_task: self.cleanup_task.cancel() self._file_executor.shutdown(wait=True) async def discover_peers(self, wait_for_peers: int = 0) -> List[PeerHandle]: @@ -71,19 +68,6 @@ async def task_find_peers_from_config(self): if DEBUG_DISCOVERY >= 2: print(f"Current known peers: {[peer.id() for peer in self.known_peers.values()]}") - async def task_clean_up_peers_from_config(self): - if DEBUG_DISCOVERY >= 2: print("Starting task to clean up peers from config...") - while True: - peers_from_config = await self._get_peers() - if peers_from_config: - peers_to_remove = [peer for peer in self.known_peers.keys() if peer not in peers_from_config] - - for peer in peers_to_remove: - if DEBUG_DISCOVERY >= 2: print(f"{peer} is no longer found in the config but is currently a known peer. Removing from known peers...") - self.known_peers.pop(peer, None) - - await asyncio.sleep(1.0) - async def _get_peers(self): try: async with self._lock: diff --git a/exo/networking/manual/test_manual_discovery.py b/exo/networking/manual/test_manual_discovery.py index a8429b1df..2eeac8244 100644 --- a/exo/networking/manual/test_manual_discovery.py +++ b/exo/networking/manual/test_manual_discovery.py @@ -156,7 +156,8 @@ async def test_dynamic_config_update(self): await asyncio.sleep(1.5) updated_peers = await self.discovery1.discover_peers(wait_for_peers=1) - self.assertEqual(len(updated_peers), 1) + # NOTE: stale peers will be cleaned up by StandardNode + self.assertEqual(len(updated_peers), 2) if __name__ == "__main__":