Revert "[autoscaler] Clean up error messages on setup failure (#5210)" (#5299)

This reverts commit 7fc15dbf7f.
This commit is contained in:
Eric Liang
2019-07-27 16:53:47 -07:00
committed by GitHub
parent 341dbf6c45
commit 6f2c5b2819
2 changed files with 7 additions and 15 deletions
+1 -1
View File
@@ -379,7 +379,7 @@ def exec_cluster(config_file, cmd, docker, screen, tmux, stop, start,
cmd,
screen,
tmux,
expect_error=True,
expect_error=stop,
port_forward=port_forward)
if tmux or screen:
+6 -14
View File
@@ -291,20 +291,12 @@ class NodeUpdater(object):
"-L", "{}:localhost:{}".format(port_forward, port_forward)
]
final_cmd = ssh + ssh_opt + get_default_ssh_options(
self.ssh_private_key, connect_timeout, self.ssh_control_path) + [
"{}@{}".format(self.ssh_user, self.ssh_ip), cmd
]
try:
self.get_caller(expect_error)(
final_cmd,
stdout=redirect or sys.stdout,
stderr=redirect or sys.stderr)
except subprocess.CalledProcessError:
logger.error("Command failed: \n\n {}\n".format(
" ".join(final_cmd)))
sys.exit(1)
self.get_caller(expect_error)(
ssh + ssh_opt + get_default_ssh_options(
self.ssh_private_key, connect_timeout, self.ssh_control_path) +
["{}@{}".format(self.ssh_user, self.ssh_ip), cmd],
stdout=redirect or sys.stdout,
stderr=redirect or sys.stderr)
class NodeUpdaterThread(NodeUpdater, Thread):