mirror of
https://github.com/wassname/ray.git
synced 2026-07-11 09:50:43 +08:00
74dc14d1fc
* Google Cloud Platform scaffolding * Add minimal gcp config example * Add googleapiclient discoveries, update gcp.config constants * Rename and update gcp.config key pair name function * Implement gcp.config._configure_project * Fix the create project get project flow * Implement gcp.config._configure_iam_role * Implement service account iam binding * Implement gcp.config._configure_key_pair * Implement rsa key pair generation * Implement gcp.config._configure_subnet * Save work-in-progress gcp.config._configure_firewall_rules. These are likely to be not needed at all. Saving them if we happen to need them later. * Remove unnecessary firewall configuration * Update example-minimal.yaml configuration * Add new wait_for_compute_operation, rename old wait_for_operation * Temporarily rename autoscaler tags due to gcp incompatibility * Implement initial gcp.node_provider.nodes * Still missing filter support * Implement initial gcp.node_provider.create_node * Implement another compute wait operation (wait_For_compute_zone_operation). TODO: figure out if we can remove the function. * Implement initial gcp.node_provider._node and node status functions * Implement initial gcp.node_provider.terminate_node * Implement node tagging and ip getter methods for nodes * Temporarily rename tags due to gcp incompatibility * Tiny tweaks for autoscaler.updater * Remove unused config from gcp node_provider * Add new example-full example to gcp, update load_gcp_example_config * Implement label filtering for gcp.node_provider.nodes * Revert unnecessary change in ssh command * Revert "Temporarily rename tags due to gcp incompatibility" This reverts commit e2fe634c5d11d705c0f5d3e76c80c37394bb23fb. * Revert "Temporarily rename autoscaler tags due to gcp incompatibility" This reverts commit c938ee435f4b75854a14e78242ad7f1d1ed8ad4b. * Refactor autoscaler tagging to support multiple tag specs * Remove missing cryptography imports * Update quote function import * Fix threading issue in gcp.config with the compute discovery object * Add gcs support for log_sync * Fix the labels/tags naming discrepancy * Add expanduser to file_mounts hashing * Fix gcp.node_provider.internal_ip * Add uuid to node name * Remove 'set -i' from updater ssh command * Also add TODO with the context and reason for the change. * Update ssh key creation in autoscaler.gcp.config * Fix wait_for_compute_zone_operation's threading issue Google discovery api's compute object is not thread safe, and thus needs to be recreated for each thread. This moves the `wait_for_compute_zone_operation` under `autoscaler.gcp.config`, and adds compute as its argument. * Address pr feedback from @ericl * Expand local file mount paths in NodeUpdater * Add ssh_user name to key names * Update updater ssh to attempt 'set -i' and fall back if that fails * Update gcp/example-full.yaml * Fix wait crm operation in gcp.config * Update gcp/example-minimal.yaml to match aws/example-minimal.yaml * Fix gcp/example-full.yaml comment indentation * Add gcp/example-full.yaml to setup files * Update example-full.yaml command * Revert "Refactor autoscaler tagging to support multiple tag specs" This reverts commit 9cf48409ca2e5b66f800153853072c706fa502f6. * Update tag spec to only use characters [0-9a-z_-] * Change the tag values to conform gcp spec * Add project_id in the ssh key name * Replace '_' with '-' in autoscaler tag names * Revert "Update updater ssh to attempt 'set -i' and fall back if that fails" This reverts commit 23a0066c5254449e49746bd5e43b94b66f32bfb4. * Revert "Remove 'set -i' from updater ssh command" This reverts commit 5fa034cdf79fa7f8903691518c0d75699c630172. * Add fallback to `set -i` in force_interactive command * Update autoscaler tests to match current implementation * Update GCPNodeProvider.create_node to include hash in instance name * Add support for creating multiple instance on one create_node call * Clean TODOs * Update styles * Replace single quotes with double quotes * Some minor indentation fixes etc. * Remove unnecessary comment. Fix indentation. * Yapfify files that fail flake8 test * Yapfify more files * Update project_id handling in gcp node provider * temporary yapf mod * Revert "temporary yapf mod" This reverts commit b6744e4e15d4d936d1a14f4bf155ed1d3bb14126. * Fix autoscaler/updater.py lint error, remove unused variable
206 lines
7.6 KiB
Python
206 lines
7.6 KiB
Python
from __future__ import absolute_import
|
|
from __future__ import division
|
|
from __future__ import print_function
|
|
|
|
try: # py3
|
|
from shlex import quote
|
|
except ImportError: # py2
|
|
from pipes import quote
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
import tempfile
|
|
import time
|
|
|
|
from multiprocessing import Process
|
|
from threading import Thread
|
|
|
|
from ray.autoscaler.node_provider import get_node_provider
|
|
from ray.autoscaler.tags import TAG_RAY_NODE_STATUS, TAG_RAY_RUNTIME_CONFIG
|
|
|
|
# How long to wait for a node to start, in seconds
|
|
NODE_START_WAIT_S = 300
|
|
SSH_CHECK_INTERVAL = 5
|
|
|
|
|
|
def pretty_cmd(cmd_str):
|
|
return "\n\n\t{}\n\n".format(cmd_str)
|
|
|
|
|
|
class NodeUpdater(object):
|
|
"""A process for syncing files and running init commands on a node."""
|
|
|
|
def __init__(self,
|
|
node_id,
|
|
provider_config,
|
|
auth_config,
|
|
cluster_name,
|
|
file_mounts,
|
|
setup_cmds,
|
|
runtime_hash,
|
|
redirect_output=True,
|
|
process_runner=subprocess):
|
|
self.daemon = True
|
|
self.process_runner = process_runner
|
|
self.provider = get_node_provider(provider_config, cluster_name)
|
|
self.ssh_private_key = auth_config["ssh_private_key"]
|
|
self.ssh_user = auth_config["ssh_user"]
|
|
self.ssh_ip = self.provider.external_ip(node_id)
|
|
self.node_id = node_id
|
|
self.file_mounts = {
|
|
remote: os.path.expanduser(local)
|
|
for remote, local in file_mounts.items()
|
|
}
|
|
self.setup_cmds = setup_cmds
|
|
self.runtime_hash = runtime_hash
|
|
if redirect_output:
|
|
self.logfile = tempfile.NamedTemporaryFile(
|
|
mode="w", prefix="node-updater-", delete=False)
|
|
self.output_name = self.logfile.name
|
|
self.stdout = self.logfile
|
|
self.stderr = self.logfile
|
|
else:
|
|
self.logfile = None
|
|
self.output_name = "(console)"
|
|
self.stdout = sys.stdout
|
|
self.stderr = sys.stderr
|
|
|
|
def run(self):
|
|
print("NodeUpdater: Updating {} to {}, logging to {}".format(
|
|
self.node_id, self.runtime_hash, self.output_name))
|
|
try:
|
|
self.do_update()
|
|
except Exception as e:
|
|
error_str = str(e)
|
|
if hasattr(e, "cmd"):
|
|
error_str = "(Exit Status {}) {}".format(
|
|
e.returncode, pretty_cmd(" ".join(e.cmd)))
|
|
print(
|
|
"NodeUpdater: Error updating {}"
|
|
"See {} for remote logs.".format(error_str, self.output_name),
|
|
file=self.stdout)
|
|
self.provider.set_node_tags(self.node_id,
|
|
{TAG_RAY_NODE_STATUS: "update-failed"})
|
|
if self.logfile is not None:
|
|
print("----- BEGIN REMOTE LOGS -----\n" +
|
|
open(self.logfile.name).read() +
|
|
"\n----- END REMOTE LOGS -----")
|
|
raise e
|
|
self.provider.set_node_tags(
|
|
self.node_id, {
|
|
TAG_RAY_NODE_STATUS: "up-to-date",
|
|
TAG_RAY_RUNTIME_CONFIG: self.runtime_hash
|
|
})
|
|
print(
|
|
"NodeUpdater: Applied config {} to node {}".format(
|
|
self.runtime_hash, self.node_id),
|
|
file=self.stdout)
|
|
|
|
def do_update(self):
|
|
self.provider.set_node_tags(self.node_id,
|
|
{TAG_RAY_NODE_STATUS: "waiting-for-ssh"})
|
|
deadline = time.time() + NODE_START_WAIT_S
|
|
|
|
# Wait for external IP
|
|
while time.time() < deadline and \
|
|
not self.provider.is_terminated(self.node_id):
|
|
print(
|
|
"NodeUpdater: Waiting for IP of {}...".format(self.node_id),
|
|
file=self.stdout)
|
|
self.ssh_ip = self.provider.external_ip(self.node_id)
|
|
if self.ssh_ip is not None:
|
|
break
|
|
time.sleep(10)
|
|
assert self.ssh_ip is not None, "Unable to find IP of node"
|
|
|
|
# Wait for SSH access
|
|
ssh_ok = False
|
|
while time.time() < deadline and \
|
|
not self.provider.is_terminated(self.node_id):
|
|
try:
|
|
print(
|
|
"NodeUpdater: Waiting for SSH to {}...".format(
|
|
self.node_id),
|
|
file=self.stdout)
|
|
if not self.provider.is_running(self.node_id):
|
|
raise Exception("Node not running yet...")
|
|
self.ssh_cmd(
|
|
"uptime",
|
|
connect_timeout=5,
|
|
redirect=open("/dev/null", "w"))
|
|
ssh_ok = True
|
|
except Exception as e:
|
|
retry_str = str(e)
|
|
if hasattr(e, "cmd"):
|
|
retry_str = "(Exit Status {}): {}".format(
|
|
e.returncode, pretty_cmd(" ".join(e.cmd)))
|
|
print(
|
|
"NodeUpdater: SSH not up, retrying: {}".format(retry_str),
|
|
file=self.stdout)
|
|
time.sleep(SSH_CHECK_INTERVAL)
|
|
else:
|
|
break
|
|
assert ssh_ok, "Unable to SSH to node"
|
|
|
|
# Rsync file mounts
|
|
self.provider.set_node_tags(self.node_id,
|
|
{TAG_RAY_NODE_STATUS: "syncing-files"})
|
|
for remote_path, local_path in self.file_mounts.items():
|
|
print(
|
|
"NodeUpdater: Syncing {} to {}...".format(
|
|
local_path, remote_path),
|
|
file=self.stdout)
|
|
assert os.path.exists(local_path), local_path
|
|
if os.path.isdir(local_path):
|
|
if not local_path.endswith("/"):
|
|
local_path += "/"
|
|
if not remote_path.endswith("/"):
|
|
remote_path += "/"
|
|
self.ssh_cmd("mkdir -p {}".format(os.path.dirname(remote_path)))
|
|
self.process_runner.check_call(
|
|
[
|
|
"rsync", "-e", "ssh -i {} ".format(self.ssh_private_key) +
|
|
"-o ConnectTimeout=120s -o StrictHostKeyChecking=no",
|
|
"--delete", "-avz", "{}".format(local_path),
|
|
"{}@{}:{}".format(self.ssh_user, self.ssh_ip, remote_path)
|
|
],
|
|
stdout=self.stdout,
|
|
stderr=self.stderr)
|
|
|
|
# Run init commands
|
|
self.provider.set_node_tags(self.node_id,
|
|
{TAG_RAY_NODE_STATUS: "setting-up"})
|
|
for cmd in self.setup_cmds:
|
|
self.ssh_cmd(cmd, verbose=True)
|
|
|
|
def ssh_cmd(self, cmd, connect_timeout=120, redirect=None, verbose=False):
|
|
if verbose:
|
|
print(
|
|
"NodeUpdater: running {} on {}...".format(
|
|
pretty_cmd(cmd), self.ssh_ip),
|
|
file=self.stdout)
|
|
force_interactive = "set -i || true && source ~/.bashrc && "
|
|
self.process_runner.check_call(
|
|
[
|
|
"ssh", "-o", "ConnectTimeout={}s".format(connect_timeout),
|
|
"-o", "StrictHostKeyChecking=no", "-i", self.ssh_private_key,
|
|
"{}@{}".format(self.ssh_user, self.ssh_ip),
|
|
"bash --login -c {}".format(quote(force_interactive + cmd))
|
|
],
|
|
stdout=redirect or self.stdout,
|
|
stderr=redirect or self.stderr)
|
|
|
|
|
|
class NodeUpdaterProcess(NodeUpdater, Process):
|
|
def __init__(self, *args, **kwargs):
|
|
Process.__init__(self)
|
|
NodeUpdater.__init__(self, *args, **kwargs)
|
|
|
|
|
|
# Single-threaded version for unit tests
|
|
class NodeUpdaterThread(NodeUpdater, Thread):
|
|
def __init__(self, *args, **kwargs):
|
|
Thread.__init__(self)
|
|
NodeUpdater.__init__(self, *args, **kwargs)
|
|
self.exitcode = 0
|