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

Revert "[autoscaler] Fix redirects, fix submit (#4085)" (#4158)

Browse Source 
This reverts commit acf4d53b55.
This commit is contained in:
Eric Liang
2019-02-25 17:00:59 -08:00
committed by GitHub
parent 3896b726dd
commit 60dbc771a2
3 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/autoscaler/updater.py
+8 -18
View File
@@ -206,9 +206,12 @@ class NodeUpdater(object):
m = "{}: Synced {} to {}".format(self.node_id, local_path,
remote_path)
with LogTimer("NodeUpdater {}".format(m)):
self.ssh_cmd("mkdir -p {}".format(
os.path.dirname(remote_path)))
self.rsync_up(local_path, remote_path)
self.ssh_cmd(
"mkdir -p {}".format(os.path.dirname(remote_path)),
redirect=open("/dev/null", "w"),
)
self.rsync_up(
local_path, remote_path, redirect=open("/dev/null", "w"))
# Run init commands
self.provider.set_node_tags(self.node_id,
@@ -217,19 +220,15 @@ class NodeUpdater(object):
m = "{}: Initialization commands completed".format(self.node_id)
with LogTimer("NodeUpdater: {}".format(m)):
for cmd in self.initialization_commands:
self.ssh_cmd(cmd)
self.ssh_cmd(cmd, redirect=open("/dev/null", "w"))
m = "{}: Setup commands completed".format(self.node_id)
with LogTimer("NodeUpdater: {}".format(m)):
for cmd in self.setup_commands:
self.ssh_cmd(cmd)
self.ssh_cmd(cmd, redirect=open("/dev/null", "w"))
def rsync_up(self, source, target, redirect=None, check_error=True):
self.set_ssh_ip_if_required()
if redirect is None:
if logger.getEffectiveLevel() > logging.DEBUG:
redirect = open("/dev/null", "w")
self.get_caller(check_error)(
[
"rsync", "-e",
@@ -243,11 +242,6 @@ class NodeUpdater(object):
def rsync_down(self, source, target, redirect=None, check_error=True):
self.set_ssh_ip_if_required()
if redirect is None:
if logger.getEffectiveLevel() > logging.DEBUG:
redirect = open("/dev/null", "w")
self.get_caller(check_error)(
[
"rsync", "-e",
@@ -270,10 +264,6 @@ class NodeUpdater(object):
self.set_ssh_ip_if_required()
if redirect is None:
if logger.getEffectiveLevel() > logging.DEBUG:
redirect = open("/dev/null", "w")
logger.info("NodeUpdater: Running {} on {}...".format(
cmd, self.ssh_ip))
ssh = ["ssh"]