Skip to content

Fix bug when connecting another driver in local case. #1760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcmoritz merged 2 commits into from
Mar 21, 2018
Merged

Fix bug when connecting another driver in local case. #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
353991c
Allow connecting another driver when using ip address 127.0.0.1.
robertnishihara Mar 21, 2018
02172f4
Add test.
robertnishihara Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion python/ray/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,10 @@ def get_address_info_from_redis_helper(redis_address, node_ip_address):
assert b"ray_client_id" in info
assert b"node_ip_address" in info
assert b"client_type" in info
if info[b"node_ip_address"].decode("ascii") == node_ip_address:
client_node_ip_address = info[b"node_ip_address"].decode("ascii")
if (client_node_ip_address == node_ip_address or
(client_node_ip_address == "127.0.0.1" and
redis_ip_address == ray.services.get_node_ip_address())):
if info[b"client_type"].decode("ascii") == "plasma_manager":
plasma_managers.append(info)
elif info[b"client_type"].decode("ascii") == "local_scheduler":
Expand Down
19 changes: 19 additions & 0 deletions test/multi_node_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,5 +283,24 @@ def f():
subprocess.Popen(["ray", "stop"]).wait()


class MiscellaneousTest(unittest.TestCase):
def tearDown(self):
ray.worker.cleanup()

def testConnectingInLocalCase(self):
address_info = ray.init(num_cpus=0)

# Define a driver that just connects to Redis.
driver_script = """
import ray
ray.init(redis_address="{}")
print("success")
""".format(address_info["redis_address"])

out = run_string_as_driver(driver_script)
# Make sure the other driver succeeded.
self.assertIn("success", out)


if __name__ == "__main__":
unittest.main(verbosity=2)