Revert "Revert "Open 8001 port as one that will be used for nanny-con…

…tact-address"" This reverts commit 1f9be32.
CoffeaTeam · Feb 17, 2023 · d50c81d · d50c81d
1 parent 78de622
commit d50c81d
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/coffea_casa/coffea_casa.py b/coffea_casa/coffea_casa.py
@@ -11,7 +11,7 @@
 DEFAULT_SCHEDULER_PORT = 8786
 DEFAULT_DASHBOARD_PORT = 8787
 DEFAULT_CONTAINER_PORT = 8786
-#DEFAULT_NANNY_PORT = 8001
+DEFAULT_NANNY_PORT = 8001
 
 # Security settings for Dask scheduler
 # REMOVE ME (backward compatibity for now)
@@ -71,7 +71,7 @@ def __init__(self,
                  scheduler_options=None,
                  scheduler_port=DEFAULT_SCHEDULER_PORT,
                  dashboard_port=DEFAULT_DASHBOARD_PORT,
-                 #nanny_port=DEFAULT_NANNY_PORT,
+                 nanny_port=DEFAULT_NANNY_PORT,
                  **job_kwargs):
         """
         Parameters
@@ -118,7 +118,7 @@ def __init__(self,
             worker_image=worker_image,
             scheduler_port=scheduler_port,
             dashboard_port=dashboard_port,
-            #nanny_port=nanny_port,
+            nanny_port=nanny_port,
         )
         # Instantiate args and parameters from parent abstract class security=security
         super().__init__(**job_kwargs)
@@ -132,7 +132,7 @@ def _modify_job_kwargs(cls,
                            scheduler_options=None,
                            scheduler_port=DEFAULT_SCHEDULER_PORT,
                            dashboard_port=DEFAULT_DASHBOARD_PORT,
-                           #nanny_port=DEFAULT_NANNY_PORT
+                           nanny_port=DEFAULT_NANNY_PORT
                            ):
         job_config = job_kwargs.copy()
         input_files = []
@@ -190,10 +190,9 @@ def _modify_job_kwargs(cls,
                 "docker_image": worker_image or dask.config.get(f"jobqueue.{cls.config_name}.worker-image")
             },
             {
-                #"container_service_names": "dask,nanny",
-                #"dask_container_port": DEFAULT_CONTAINER_PORT,
-                #"nanny_container_port": nanny_port,
-                "container_service_names": "dask",
+                "container_service_names": "dask,nanny",
+                "dask_container_port": DEFAULT_CONTAINER_PORT,
+                "nanny_container_port": DEFAULT_NANNY_PORT,
                 "dask_container_port": DEFAULT_CONTAINER_PORT,
             },
             {"transfer_input_files": files},