Skip to content
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.

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

[Core] Fix session_name not reused when GCS restarts + node ip address not set for driver #39211

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
d2f802a
ip
rkooo567 Jul 20, 2023
a391f66
ip
rkooo567 Jul 21, 2023
3966778
working now.
rkooo567 Jul 21, 2023
992d7ab
working + lint
rkooo567 Jul 21, 2023
8083748
Fix
rkooo567 Jul 21, 2023
73bdd49
Merge branch 'master' into automatically-set-node-ip-addr
rkooo567 Aug 10, 2023
a25aa34
ip
rkooo567 Aug 10, 2023
fa2dc4c
Merge branch 'master' into automatically-set-node-ip-addr
rkooo567 Aug 22, 2023
db2af38
ip
rkooo567 Aug 22, 2023
8476e4f
ip
rkooo567 Aug 22, 2023
ba69b1b
Made it work.
rkooo567 Aug 22, 2023
4a0dd44
working
rkooo567 Aug 22, 2023
f6ee80e
Fixed a broken test.
rkooo567 Aug 22, 2023
023b3a4
Merge branch 'master' into automatically-set-node-ip-addr
rkooo567 Aug 22, 2023
dba0008
Fixed the test failure.
rkooo567 Aug 22, 2023
77b933c
print error messages before assertion
rkooo567 Aug 23, 2023
87ea063
Merge branch 'master' into automatically-set-node-ip-addr
rkooo567 Aug 23, 2023
302ecd8
ip
rkooo567 Aug 23, 2023
cdbf084
more info for debugging.
rkooo567 Aug 23, 2023
b9aedbb
Merge branch 'master' into automatically-set-node-ip-addr
rkooo567 Aug 31, 2023
55979f0
ip
rkooo567 Aug 31, 2023
4dbb1af
ip
rkooo567 Aug 31, 2023
32de899
ip
rkooo567 Aug 31, 2023
632442a
ip
rkooo567 Aug 31, 2023
1705ec4
remove bind
rkooo567 Aug 31, 2023
cbff14f
try fixing it.
rkooo567 Aug 31, 2023
3107619
remove print
rkooo567 Aug 31, 2023
bb8e1f6
Work around.
rkooo567 Aug 31, 2023
eeb3610
.
rkooo567 Aug 31, 2023
484c68a
Revert
rkooo567 Sep 1, 2023
748ddf8
Wokrs not
rkooo567 Sep 1, 2023
f35a165
Fix failed ha tests.
rkooo567 Sep 1, 2023
01e492a
fix some tests.
rkooo567 Sep 1, 2023
8a14bcc
done
rkooo567 Sep 1, 2023
cd2b44d
maybe working?
rkooo567 Sep 1, 2023
9330cc6
Revert "maybe working?"
rkooo567 Sep 1, 2023
e32d538
Revert "done"
rkooo567 Sep 1, 2023
0e73a7e
Revert "fix some tests."
rkooo567 Sep 1, 2023
b3d590a
Revert "Fix failed ha tests."
rkooo567 Sep 1, 2023
5a41237
Revert "Wokrs not"
rkooo567 Sep 1, 2023
5df758f
clean up
rkooo567 Sep 1, 2023
951e54c
Revert "Revert "Wokrs not""
rkooo567 Sep 1, 2023
32e65fc
Revert "Revert "Fix failed ha tests.""
rkooo567 Sep 1, 2023
ec0591f
Revert "Revert "fix some tests.""
rkooo567 Sep 1, 2023
6734082
Revert "Revert "done""
rkooo567 Sep 1, 2023
672d996
Revert "Revert "maybe working?""
rkooo567 Sep 1, 2023
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
Prev Previous commit
Next Next commit
Fix
Signed-off-by: SangBin Cho <[email protected]>
  • Loading branch information
rkooo567 committed Jul 21, 2023
commit 8083748424d1d62b10d8a0230e3d04facd43f0e1
7 changes: 0 additions & 7 deletions python/ray/_private/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,6 @@ def __init__(
node_ip_address=node_ip_address, raylet_ip_address=node_ip_address
)

# Try to get node IP address with the parameters.
# if ray_params.node_ip_address:
# node_ip_address = ray_params.node_ip_address
# elif ray_params.redis_address:
# node_ip_address = ray.util.get_node_ip_address(ray_params.redis_address)
# else:
# node_ip_address = ray.util.get_node_ip_address()
self._node_ip_address = node_ip_address

if ray_params.raylet_ip_address:
Expand Down
3 changes: 3 additions & 0 deletions python/ray/_private/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -1284,6 +1284,7 @@ def init(
)
_redis_max_memory: Optional[int] = kwargs.pop("_redis_max_memory", None)
_plasma_directory: Optional[str] = kwargs.pop("_plasma_directory", None)
_node_ip_address: str = kwargs.pop("_node_ip_address", None)
_driver_object_store_memory: Optional[int] = kwargs.pop(
"_driver_object_store_memory", None
)
Expand Down Expand Up @@ -1471,6 +1472,7 @@ def init(

# Use a random port by not specifying Redis port / GCS server port.
ray_params = ray._private.parameter.RayParams(
node_ip_address=_node_ip_address,
object_ref_seed=None,
driver_mode=driver_mode,
redirect_output=None,
Expand Down Expand Up @@ -1553,6 +1555,7 @@ def init(

# In this case, we only need to connect the node.
ray_params = ray._private.parameter.RayParams(
node_ip_address=_node_ip_address,
gcs_address=gcs_address,
redis_address=redis_address,
redis_password=_redis_password,
Expand Down
Loading