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

Remove public facing references to --redis-address. (#6631)

Browse Source
This commit is contained in:
Robert Nishihara
2019-12-31 13:21:53 -08:00
committed by GitHub
parent 1cb335487e
commit d2c6457832
24 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/autoscaler/aws/development-example.yaml
+1 -1
View File
@@ -116,4 +116,4 @@ head_start_ray_commands:
# Command to start ray on worker nodes. You don't need to change this.
worker_start_ray_commands:
- ray stop
- ulimit -n 65536; ray start --redis-address=$RAY_HEAD_IP:6379
- ulimit -n 65536; ray start --address=$RAY_HEAD_IP:6379
python/ray/autoscaler/aws/example-full.yaml
+1 -1
View File
@@ -139,4 +139,4 @@ head_start_ray_commands:
# Command to start ray on worker nodes. You don't need to change this.
worker_start_ray_commands:
- ray stop
- ulimit -n 65536; ray start --redis-address=$RAY_HEAD_IP:6379 --object-manager-port=8076
- ulimit -n 65536; ray start --address=$RAY_HEAD_IP:6379 --object-manager-port=8076
python/ray/autoscaler/aws/example-gpu-docker.yaml
+1 -1
View File
@@ -124,4 +124,4 @@ head_start_ray_commands:
# Command to start ray on worker nodes. You don't need to change this.
worker_start_ray_commands:
- ray stop
- ulimit -n 65536; ray start --redis-address=$RAY_HEAD_IP:6379 --object-manager-port=8076
- ulimit -n 65536; ray start --address=$RAY_HEAD_IP:6379 --object-manager-port=8076
python/ray/autoscaler/gcp/example-full.yaml
+1 -1
View File
@@ -159,5 +159,5 @@ worker_start_ray_commands:
- >-
ulimit -n 65536;
ray start
--redis-address=$RAY_HEAD_IP:6379
--address=$RAY_HEAD_IP:6379
--object-manager-port=8076
python/ray/autoscaler/gcp/example-gpu-docker.yaml
+1 -1
View File
@@ -168,5 +168,5 @@ worker_start_ray_commands:
- >-
ulimit -n 65536;
ray start
--redis-address=$RAY_HEAD_IP:6379
--address=$RAY_HEAD_IP:6379
--object-manager-port=8076
python/ray/autoscaler/kubernetes/example-full.yaml
+1 -1
View File
@@ -242,4 +242,4 @@ head_start_ray_commands:
# Command to start ray on worker nodes. You don't need to change this.
worker_start_ray_commands:
- ray stop
- ulimit -n 65536; ray start --num-cpus=$MY_CPU_REQUEST --redis-address=$RAY_HEAD_IP:6379 --object-manager-port=8076
- ulimit -n 65536; ray start --num-cpus=$MY_CPU_REQUEST --address=$RAY_HEAD_IP:6379 --object-manager-port=8076
python/ray/autoscaler/local/development-example.yaml
+1 -1
View File
@@ -29,4 +29,4 @@ head_start_ray_commands:
- source activate ray && ulimit -c unlimited && ray start --head --redis-port=6379 --autoscaling-config=~/ray_bootstrap_config.yaml
worker_start_ray_commands:
- source activate ray && ray stop
- source activate ray && ray start --redis-address=$RAY_HEAD_IP:6379
- source activate ray && ray start --address=$RAY_HEAD_IP:6379
python/ray/autoscaler/local/example-full.yaml
+1 -1
View File
@@ -80,4 +80,4 @@ head_start_ray_commands:
# Command to start ray on worker nodes. You don't need to change this.
worker_start_ray_commands:
- ray stop
- ray start --redis-address=$RAY_HEAD_IP:6379
- ray start --address=$RAY_HEAD_IP:6379
python/ray/dashboard/dashboard.py
+1 -1
View File
@@ -250,7 +250,7 @@ class NodeStats(threading.Thread):
# Mapping from IP address to PID to list of error messages
self._errors = defaultdict(lambda: defaultdict(list))
ray.init(redis_address=redis_address, redis_password=redis_password)
ray.init(address=redis_address, redis_password=redis_password)
super().__init__()
python/ray/experimental/sgd/examples/cifar_tf_example.py
+3 -3
View File
@@ -151,10 +151,10 @@ def data_augmentation_creator(config):
if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument(
"--redis-address",
"--address",
required=False,
type=str,
help="the address to use for Redis")
help="the address to use for Ray")
parser.add_argument(
"--num-replicas",
"-n",
@@ -180,7 +180,7 @@ if __name__ == "__main__":
help="Finish quickly for testing. Assume False for users.")
args, _ = parser.parse_known_args()
ray.init(redis_address=args.redis_address)
ray.init(address=args.address)
data_size = 60000
test_size = 10000
batch_size = args.batch_size
python/ray/experimental/sgd/examples/example-sgd.yaml
+1 -1
View File
@@ -68,5 +68,5 @@ head_start_ray_commands:
# Command to start ray on worker nodes. You don't need to change this.
worker_start_ray_commands:
- ray stop
- ray start --redis-address=$RAY_HEAD_IP:6379 --object-manager-port=8076 --object-store-memory=1000000000
- ray start --address=$RAY_HEAD_IP:6379 --object-manager-port=8076 --object-store-memory=1000000000
python/ray/experimental/sgd/examples/tensorflow_train_example.py
+3 -3
View File
@@ -107,10 +107,10 @@ def tune_example(num_replicas=1, use_gpu=False):
if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument(
"--redis-address",
"--address",
required=False,
type=str,
help="the address to use for Redis")
help="the address to use for Ray")
parser.add_argument(
"--num-replicas",
"-n",
@@ -127,7 +127,7 @@ if __name__ == "__main__":
args, _ = parser.parse_known_args()
ray.init(redis_address=args.redis_address)
ray.init(address=args.address)
if args.tune:
tune_example(num_replicas=args.num_replicas, use_gpu=args.use_gpu)
python/ray/experimental/sgd/examples/tf-example-sgd.yaml
+1 -1
View File
@@ -69,5 +69,5 @@ head_start_ray_commands:
# Command to start ray on worker nodes. You don't need to change this.
worker_start_ray_commands:
- ray stop
- ray start --redis-address=$RAY_HEAD_IP:6379 --object-manager-port=8076 --object-store-memory=1000000000
- ray start --address=$RAY_HEAD_IP:6379 --object-manager-port=8076 --object-store-memory=1000000000
python/ray/experimental/sgd/examples/train_example.py
+3 -3
View File
@@ -97,10 +97,10 @@ def train_example(num_replicas=1, use_gpu=False):
if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument(
"--redis-address",
"--address",
required=False,
type=str,
help="the address to use for Redis")
help="the address to use for Ray")
parser.add_argument(
"--num-replicas",
"-n",
@@ -119,5 +119,5 @@ if __name__ == "__main__":
import ray
ray.init(redis_address=args.redis_address)
ray.init(address=args.address)
train_example(num_replicas=args.num_replicas, use_gpu=args.use_gpu)
python/ray/experimental/sgd/examples/tune_example.py
+3 -3
View File
@@ -99,9 +99,9 @@ if __name__ == "__main__":
import argparse
parser = argparse.ArgumentParser()
parser.add_argument(
"--redis-address",
"--address",
type=str,
help="the address to use for Redis")
help="the address to use for Ray")
parser.add_argument(
"--num-replicas",
"-n",
@@ -118,5 +118,5 @@ if __name__ == "__main__":
args, _ = parser.parse_known_args()
ray.init(redis_address=args.redis_address)
ray.init(address=args.address)
tune_example(num_replicas=args.num_replicas, use_gpu=args.use_gpu)
python/ray/scripts/scripts.py
+7 -11
View File
@@ -71,12 +71,9 @@ def cli(logging_level, logging_format):
type=str,
help="the IP address of this node")
@click.option(
"--redis-address",
required=False,
type=str,
help="the address to use for connecting to Redis")
"--redis-address", required=False, type=str, help="same as --address")
@click.option(
"--address", required=False, type=str, help="same as --redis-address")
"--address", required=False, type=str, help="the address to use for Ray")
@click.option(
"--redis-port",
required=False,
@@ -334,19 +331,18 @@ def start(node_ip_address, redis_address, address, redis_port,
logger.info(
"\nStarted Ray on this node. You can add additional nodes to "
"the cluster by calling\n\n"
" ray start --redis-address {}{}{}\n\n"
" ray start --address='{}'{}\n\n"
"from the node you wish to add. You can connect a driver to the "
"cluster from Python by running\n\n"
" import ray\n"
" ray.init(redis_address=\"{}{}{}\")\n\n"
" ray.init(address='auto'{})\n\n"
"If you have trouble connecting from a different machine, check "
"that your firewall is configured properly. If you wish to "
"terminate the processes that have been started, run\n\n"
" ray stop".format(
redis_address, " --redis-password "
if redis_password else "", redis_password if redis_password
else "", redis_address, "\", redis_password=\""
if redis_password else "", redis_password
redis_address, " --redis-password='" + redis_password + "'"
if redis_password else "",
", redis_password='" + redis_password + "'"
if redis_password else ""))
else:
# Start Ray on a non-head node.
python/ray/tests/conftest.py
+2 -2
View File
@@ -156,11 +156,11 @@ def call_ray_start(request):
out = ray.utils.decode(
subprocess.check_output(command_args, stderr=subprocess.STDOUT))
# Get the redis address from the output.
redis_substring_prefix = "redis_address=\""
redis_substring_prefix = "--address='"
address_location = (
out.find(redis_substring_prefix) + len(redis_substring_prefix))
address = out[address_location:]
address = address.split("\"")[0]
address = address.split("'")[0]
yield address
python/ray/tests/test_multi_node.py
+1 -1
View File
@@ -380,7 +380,7 @@ def test_calling_start_ray_head(call_ray_stop_only):
# Test starting Ray with invalid arguments.
with pytest.raises(subprocess.CalledProcessError):
subprocess.check_output(
["ray", "start", "--head", "--redis-address", "127.0.0.1:6379"])
["ray", "start", "--head", "--address", "127.0.0.1:6379"])
subprocess.check_output(["ray", "stop"])
# Test --block. Killing a child process should cause the command to exit.