refactor: remove legacy code

The legacy code that has no effect creates confusion. Hence, it is now purged.
cisco-open · Apr 5, 2023 · d757486 · d757486
1 parent dde88d1
commit d757486
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 734 deletions.
diff --git a/lib/python/flame/channel_manager.py b/lib/python/flame/channel_manager.py
@@ -23,10 +23,9 @@
 
 from flame.backends import backend_provider
 from flame.channel import Channel
-from flame.common.constants import DEFAULT_RUN_ASYNC_WAIT_TIME, BackendEvent
+from flame.common.constants import BackendEvent
 from flame.common.util import background_thread_loop, run_async
 from flame.config import Config
-from flame.discovery_clients import discovery_client_provider
 from flame.selectors import selector_provider
 
 logger = logging.getLogger(__name__)
@@ -67,7 +66,6 @@ class ChannelManager(object):
 
     _backend = None  # default backend in case there is no per-channel backend
     _backends = dict()  # backend per channel
-    _discovery_client = None
 
     def __new__(cls):
         """Create a singleton instance."""
@@ -85,13 +83,8 @@ def __call__(self, config: Config):
 
         self._channels = {}
 
-        with background_thread_loop() as loop:
-            self._loop = loop
-
         self._setup_backends()
 
-        self._discovery_client = discovery_client_provider.get(self._config.task)
-
         atexit.register(self.cleanup)
 
     def _setup_backends(self):
@@ -178,18 +171,7 @@ def leave(self, name):
         """Leave a channel."""
         if not self.is_joined(name):
             return
-
-        # TODO: reset_channel isn't implemented; the whole discovery module
-        #       needs to be revisited.
-        coro = self._discovery_client.reset_channel(
-            self._job_id, name, self._role, self._backend.uid()
-        )
-
-        _, status = run_async(coro, self._loop, DEFAULT_RUN_ASYNC_WAIT_TIME)
-        if status:
-            del self._channels[name]
-
-        return status
+        # TODO: reset_channel isn't implemented yet
 
     def get_by_tag(self, tag: str) -> Optional[Channel]:
         """Return a channel object that matches a given function tag."""

diff --git a/lib/python/flame/discovery/__init__.py b/lib/python/flame/discovery/__init__.py
diff --git a/lib/python/flame/discovery/local_client.py b/lib/python/flame/discovery/local_client.py
diff --git a/lib/python/flame/discovery/local_server.py b/lib/python/flame/discovery/local_server.py
diff --git a/lib/python/flame/discovery_clients.py b/lib/python/flame/discovery_clients.py
diff --git a/lib/python/flame/proto/protobuf.sh b/lib/python/flame/proto/protobuf.sh
@@ -15,8 +15,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-
-protoc -I=./ --python_out=./ ./registry_msg.proto
 # To run the following command, grpcio-tools is needed.
 # if it's not installed, run "pip install grpcio-tools"
 python -m grpc_tools.protoc -I=./ --python_out=./ --grpc_python_out=./ ./backend_msg.proto