Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions python/ray/_private/gcs_pubsub.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ async def _poll(self, timeout=None) -> None:
try:
self._last_batch_size = len(poll.result().pub_messages)
if poll.result().publisher_id != self._publisher_id:
if self._publisher_id != "":
if self._publisher_id != b"":
logger.debug(
f"replied publisher_id {poll.result().publisher_id}"
f"replied publisher_id {poll.result().publisher_id} "
f"different from {self._publisher_id}, this should "
"only happens during gcs failover."
"only happen during gcs failover."
)
self._publisher_id = poll.result().publisher_id
self._max_processed_sequence_id = 0
Expand Down
12 changes: 10 additions & 2 deletions python/ray/tests/test_advanced.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,17 @@ def verify(expected_task_status):

return True

wait_for_condition(lambda: verify(common_pb2.TaskStatus.PENDING_NODE_ASSIGNMENT))
wait_for_condition(
lambda: verify(common_pb2.TaskStatus.PENDING_NODE_ASSIGNMENT),
timeout=30,
retry_interval_ms=1000,
)
cluster.add_node(resources={"worker": 2})
wait_for_condition(lambda: verify(common_pb2.TaskStatus.SUBMITTED_TO_WORKER))
wait_for_condition(
lambda: verify(common_pb2.TaskStatus.SUBMITTED_TO_WORKER),
timeout=30,
retry_interval_ms=1000,
)


def test_multiple_waits_and_gets(shutdown_only):
Expand Down