wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-07-30 12:30:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to specify SOCKS proxy for SSH connections (#8833)

Browse Source
This commit is contained in:
Vasily Litvinov
2020-07-13 16:10:07 -07:00
committed by GitHub
parent dfe3ebe4a2
commit 6ad13e0da8
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/autoscaler/command_runner.py
+12 -8
View File
@@ -220,7 +220,8 @@ class SSHOptions:
self.arg_dict["ConnectTimeout"] = "{}s".format(timeout)
return ["-i", self.ssh_key] + [
x for y in (["-o", "{}={}".format(k, v)]
for k, v in self.arg_dict.items()) for x in y
for k, v in self.arg_dict.items()
if v is not None) for x in y
]
@@ -243,8 +244,11 @@ class SSHCommandRunner(CommandRunnerInterface):
self.ssh_user = auth_config["ssh_user"]
self.ssh_control_path = ssh_control_path
self.ssh_ip = None
self.base_ssh_options = SSHOptions(self.ssh_private_key,
self.ssh_control_path)
self.ssh_proxy_command = auth_config.get("ssh_proxy_command", None)
self.ssh_options = SSHOptions(
self.ssh_private_key,
self.ssh_control_path,
ProxyCommand=self.ssh_proxy_command)
def _get_node_ip(self):
if self.use_internal_ip:
@@ -292,7 +296,7 @@ class SSHCommandRunner(CommandRunnerInterface):
with_output=False,
ssh_options_override=None,
**kwargs):
ssh_options = ssh_options_override or self.base_ssh_options
ssh_options = ssh_options_override or self.ssh_options
assert isinstance(
ssh_options, SSHOptions
@@ -342,8 +346,8 @@ class SSHCommandRunner(CommandRunnerInterface):
self._set_ssh_ip_if_required()
self.process_runner.check_call([
"rsync", "--rsh",
" ".join(["ssh"] +
self.base_ssh_options.to_ssh_options_list(timeout=120)),
subprocess.list2cmdline(
["ssh"] + self.ssh_options.to_ssh_options_list(timeout=120)),
"-avz", source, "{}@{}:{}".format(self.ssh_user, self.ssh_ip,
target)
])
@@ -352,8 +356,8 @@ class SSHCommandRunner(CommandRunnerInterface):
self._set_ssh_ip_if_required()
self.process_runner.check_call([
"rsync", "--rsh",
" ".join(["ssh"] +
self.base_ssh_options.to_ssh_options_list(timeout=120)),
subprocess.list2cmdline(
["ssh"] + self.ssh_options.to_ssh_options_list(timeout=120)),
"-avz", "{}@{}:{}".format(self.ssh_user, self.ssh_ip,
source), target
])