default val for Grpc config

ray-project · Jul 10, 2023 · b5a3f08 · b5a3f08
1 parent cdc1996
commit b5a3f08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/fed/config.py b/fed/config.py
@@ -7,7 +7,7 @@
 import fed._private.compatible_utils as compatible_utils
 import fed._private.constants as fed_constants
 import cloudpickle
-from typing import Dict, Optional
+from typing import Dict, List, Optional
 import json
 
 
@@ -163,8 +163,8 @@ class CrossSiloGrpcCommConfig(CrossSiloCommConfig):
                 ]
     """
     def __init__(self,
-                 grpc_channel_options,
-                 grpc_retry_policy,
+                 grpc_channel_options: List = None,
+                 grpc_retry_policy: Dict[str, str] = None,
                  *args,
                  **kwargs):
         super().__init__(*args, **kwargs)

diff --git a/fed/proxy/barriers.py b/fed/proxy/barriers.py
@@ -254,7 +254,7 @@ def start_recv_proxy(
         proxy_cls=proxy_cls
     )
     recver_proxy_actor.start.remote()
-    timeout = get_job_config().cross_silo_comm_config.timeout_in_seconds
+    timeout = proxy_config.timeout_in_seconds if proxy_config is not None else 60
     server_state = ray.get(recver_proxy_actor.is_ready.remote(), timeout=timeout)
     assert server_state[0], server_state[1]
     logger.info("RecverProxy has successfully created.")