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

Register credis with redis (#1730)

Browse Source
This commit is contained in:
Philipp Moritz
2018-03-18 14:02:19 -07:00
committed by Robert Nishihara
parent 070e27ea7a
commit 7b493aa4a1
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/services.py
+13 -2
View File
@@ -388,6 +388,7 @@ def check_version_info(redis_client):
def start_credis(node_ip_address, def start_credis(node_ip_address,
redis_address,
port=None, port=None,
redirect_output=False, redirect_output=False,
cleanup=True): cleanup=True):
@@ -400,6 +401,8 @@ def start_credis(node_ip_address,
Args: Args:
node_ip_address: The IP address of the current node. This is only used node_ip_address: The IP address of the current node. This is only used
for recording the log filenames in Redis. for recording the log filenames in Redis.
redis_address (str): The IP address and port of the primary redis
server.
port (int): If provided, the primary Redis shard will be started on port (int): If provided, the primary Redis shard will be started on
this port. this port.
redirect_output (bool): True if output should be redirected to a file redirect_output (bool): True if output should be redirected to a file
@@ -439,7 +442,15 @@ def start_credis(node_ip_address,
master_client.execute_command("MASTER.ADD", node_ip_address, head_port) master_client.execute_command("MASTER.ADD", node_ip_address, head_port)
master_client.execute_command("MASTER.ADD", node_ip_address, tail_port) master_client.execute_command("MASTER.ADD", node_ip_address, tail_port)
return address(node_ip_address, master_port) credis_address = address(node_ip_address, master_port)
# Register credis master in redis
redis_ip_address, redis_port = redis_address.split(":")
redis_client = redis.StrictRedis(host=redis_ip_address,
port=redis_port)
redis_client.set("credis_address", credis_address)
return credis_address
def start_redis(node_ip_address, def start_redis(node_ip_address,
@@ -1142,7 +1153,7 @@ def start_ray_processes(address_info=None,
address_info["redis_address"] = redis_address address_info["redis_address"] = redis_address
if "RAY_USE_NEW_GCS" in os.environ: if "RAY_USE_NEW_GCS" in os.environ:
credis_address = start_credis( credis_address = start_credis(
node_ip_address, cleanup=cleanup) node_ip_address, redis_address, cleanup=cleanup)
address_info["credis_address"] = credis_address address_info["credis_address"] = credis_address
time.sleep(0.1) time.sleep(0.1)
test/credis_test.py
+9 -5
View File
@@ -14,17 +14,21 @@ import ray
"Tests functionality of the new GCS.") "Tests functionality of the new GCS.")
class CredisTest(unittest.TestCase): class CredisTest(unittest.TestCase):
def setUp(self): def setUp(self):
self.config = ray.init() self.config = ray.init(num_workers=0)
def tearDown(self): def tearDown(self):
ray.worker.cleanup() ray.worker.cleanup()
def test_credis_started(self): def test_credis_started(self):
assert "credis_address" in self.config assert "credis_address" in self.config
address, port = self.config["credis_address"].split(":") credis_address, credis_port = self.config["credis_address"].split(":")
redis_client = redis.StrictRedis(host=address, credis_client = redis.StrictRedis(host=credis_address,
port=port) port=credis_port)
assert redis_client.ping() is True assert credis_client.ping() is True
redis_client = ray.worker.global_state.redis_client
addr = redis_client.get("credis_address").decode("ascii")
assert addr == self.config["credis_address"]
if __name__ == "__main__": if __name__ == "__main__":