support starting server in docker container for on-demand clusters

runhouse/constants.py

@@ -58,6 +58,7 @@
 TEST_ORG = "test-org"
 
 EMPTY_DEFAULT_ENV_NAME = "_cluster_default_env"
+DEFAULT_DOCKER_CONTAINER_NAME = "sky_container"
 
 # cluster status constants
 DOUBLE_SPACE_UNICODE = "\u00A0\u00A0"

runhouse/main.py

@@ -601,7 +601,7 @@ def _start_server(
     try:
         # Open and read the lines of the server logfile so we only print the most recent lines after starting
         f = None
-        if screen and Path(SERVER_LOGFILE).exists():
+        if (screen or nohup) and Path(SERVER_LOGFILE).exists():
             f = open(SERVER_LOGFILE, "r")
             f.readlines()  # Discard these, they're from the previous times the server was started
 
@@ -621,7 +621,7 @@ def _start_server(
 
         server_started_str = "Uvicorn running on"
         # Read and print the server logs until the
-        if screen:
+        if (screen or nohup):
             while not Path(SERVER_LOGFILE).exists():
                 time.sleep(1)
             f = f or open(SERVER_LOGFILE, "r")

runhouse/resources/hardware/cluster.py

@@ -122,6 +122,10 @@ def creds_values(self) -> Dict:
 
         return self._creds.values
 
+    @property
+    def docker_user(self) -> Optional[str]:
+        return None
+
     @property
     def default_env(self):
         from runhouse.resources.envs import Env
@@ -715,6 +719,7 @@ def ssh_tunnel(
         return ssh_tunnel(
             address=self.address,
             ssh_creds=self.creds_values,
+            docker_user=self.docker_user,
             local_port=local_port,
             ssh_port=self.ssh_port,
             remote_port=remote_port,
@@ -1073,6 +1078,7 @@ def _rsync(
             **ssh_credentials,
             ssh_control_name=ssh_control_name,
             port=self.ssh_port,
+            docker_user=self.docker_user,
         )
         if not pwd:
             if up:
@@ -1147,6 +1153,7 @@ def ssh(self):
             ssh_user=creds["ssh_user"],
             port=self.ssh_port,
             ssh_private_key=creds["ssh_private_key"],
+            docker_user=self.docker_user,
         )
         subprocess.run(
             runner._ssh_base_command(ssh_mode=SshMode.INTERACTIVE, port_forward=None)
@@ -1325,6 +1332,7 @@ def _run_commands_with_ssh(
             **ssh_credentials,
             ssh_control_name=ssh_control_name,
             port=self.ssh_port,
+            docker_user=self.docker_user,
         )
 
         env_var_prefix = (

runhouse/resources/hardware/on_demand_cluster.py

@@ -98,6 +98,7 @@ def __init__(
         self.stable_internal_external_ips = kwargs.get(
             "stable_internal_external_ips", None
         )
+        self._docker_user = None
 
         # Checks if state info is in local sky db, populates if so.
         if not dryrun and not self.ips and not self.creds_values:
@@ -123,6 +124,22 @@ def autostop_mins(self, mins):
             sky.autostop(self.name, mins, down=True)
             self._autostop_mins = mins
 
+    @property
+    def docker_user(self) -> str:
+        if self._docker_user:
+            return self._docker_user
+
+        if not self.image_id:
+            return None
+
+        from runhouse.resources.hardware.sky_ssh_runner import get_docker_user
+
+        if not self._creds:
+            return
+        self._docker_user = get_docker_user(self, self._creds.values)
+
+        return self._docker_user
+
     def config(self, condensed=True):
         config = super().config(condensed)
         self.save_attrs_to_config(
@@ -547,10 +564,15 @@ def ssh(self, node: str = None):
                 ip=node or self.address,
                 ssh_user=ssh_user,
                 port=self.ssh_port,
-                ssh_private_key=sky_key,
+                ssh_private_key=str(sky_key),
+                docker_user=self.docker_user,
             )
+            ssh_command = runner._ssh_base_command(
+                ssh_mode=SshMode.INTERACTIVE, port_forward=None
+            )
+            if self.docker_user:
+                ssh_command += ["&& conda deactivate"]
             subprocess.run(
-                runner._ssh_base_command(
-                    ssh_mode=SshMode.INTERACTIVE, port_forward=None
-                )
+                " ".join(ssh_command),
+                shell=True,
             )

runhouse/resources/hardware/sky_ssh_runner.py

@@ -7,7 +7,7 @@
 import time
 from typing import Dict, List, Optional, Tuple, Union
 
-from runhouse.constants import LOCALHOST
+from runhouse.constants import DEFAULT_DOCKER_CONTAINER_NAME, LOCALHOST
 
 from runhouse.globals import sky_ssh_runner_cache
 
@@ -45,6 +45,32 @@ def is_port_in_use(port: int) -> bool:
         return s.connect_ex(("localhost", port)) == 0
 
 
+def get_docker_user(cluster: "Cluster", ssh_creds: Dict) -> str:
+    """Find docker container username."""
+    runner = SkySSHRunner(
+        ip=cluster.address,
+        ssh_user=ssh_creds.get("ssh_user", None),
+        port=cluster.ssh_port,
+        ssh_private_key=ssh_creds.get("ssh_private_key", None),
+        ssh_control_name=ssh_creds.get(
+            "ssh_control_name", f"{cluster.address}:{cluster.ssh_port}"
+        ),
+    )
+    container_name = DEFAULT_DOCKER_CONTAINER_NAME
+    whoami_returncode, whoami_stdout, whoami_stderr = runner.run(
+        f"sudo docker exec {container_name} whoami",
+        stream_logs=False,
+        require_outputs=True,
+    )
+    assert whoami_returncode == 0, (
+        f"Failed to get docker container user. Return "
+        f"code: {whoami_returncode}, Error: {whoami_stderr}"
+    )
+    docker_user = whoami_stdout.strip()
+    logger.debug(f"Docker container user: {docker_user}")
+    return docker_user
+
+
 class SkySSHRunner(SSHCommandRunner):
     def __init__(
         self,
@@ -68,6 +94,9 @@ def __init__(
             docker_user,
             disable_control_master,
         )
+
+        # RH modified
+        self.docker_user = docker_user
         self.tunnel_proc = None
         self.local_bind_port = local_bind_port
         self.remote_bind_port = None
@@ -179,6 +208,8 @@ def run(
             "-i",
         ]
 
+        cmd = f"conda deactivate && {cmd}" if self.docker_user else cmd
+
         command += [
             shlex.quote(
                 f"true && source ~/.bashrc && export OMP_NUM_THREADS=1 "
@@ -434,6 +465,7 @@ def ssh_tunnel(
     ssh_port: int = 22,
     remote_port: Optional[int] = None,
     num_ports_to_try: int = 0,
+    docker_user: Optional[str] = None,
 ) -> SkySSHRunner:
     """Initialize an ssh tunnel from a remote server to localhost
 
@@ -495,6 +527,7 @@ def ssh_tunnel(
         ssh_private_key=ssh_creds.get("ssh_private_key"),
         ssh_proxy_command=ssh_creds.get("ssh_proxy_command"),
         ssh_control_name=ssh_control_name,
+        docker_user=docker_user,
         port=ssh_port,
     )
     runner.tunnel(local_port, remote_port)