From 46acb02aa4fcdc794c22c0536c3f087b7bfc1a6c Mon Sep 17 00:00:00 2001 From: Eric Liang Date: Thu, 26 Dec 2019 22:43:39 -0800 Subject: [PATCH] Fix verbose shutdown error and test_env_with_subprocesses (#6614) --- python/ray/_raylet.pyx | 5 ----- python/ray/actor.py | 1 - python/ray/includes/libcoreworker.pxd | 1 - 3 files changed, 7 deletions(-) diff --git a/python/ray/_raylet.pyx b/python/ray/_raylet.pyx index e0c054067..78aa0e5c0 100644 --- a/python/ray/_raylet.pyx +++ b/python/ray/_raylet.pyx @@ -787,11 +787,6 @@ cdef class CoreWorker: node_ip_address.encode("utf-8"), node_manager_port, task_execution_handler, check_signals, True)) - def disconnect(self): - self.destory_event_loop_if_exists() - with nogil: - self.core_worker.get().Disconnect() - def run_task_loop(self): with nogil: self.core_worker.get().StartExecutingTasks() diff --git a/python/ray/actor.py b/python/ray/actor.py index 6bd0da23e..0d22ed9f5 100644 --- a/python/ray/actor.py +++ b/python/ray/actor.py @@ -819,7 +819,6 @@ def exit_actor(): if worker.mode == ray.WORKER_MODE and not worker.actor_id.is_nil(): # Intentionally disconnect the core worker from the raylet so the # raylet won't push an error message to the driver. - worker.core_worker.disconnect() ray.disconnect() # Disconnect global state from GCS. ray.state.state.disconnect() diff --git a/python/ray/includes/libcoreworker.pxd b/python/ray/includes/libcoreworker.pxd index 0bbc269be..136666b65 100644 --- a/python/ray/includes/libcoreworker.pxd +++ b/python/ray/includes/libcoreworker.pxd @@ -81,7 +81,6 @@ cdef extern from "ray/core_worker/core_worker.h" nogil: c_vector[shared_ptr[CRayObject]] *returns) nogil, CRayStatus() nogil, c_bool ref_counting_enabled) - void Disconnect() CWorkerType &GetWorkerType() CLanguage &GetLanguage()