Revert "[Core]Fix ray.kill doesn't cancel pending actor bug (#13254)" (#14013)

This reverts commit 2092b097ea.
This commit is contained in:
Simon Mo
2021-02-09 11:36:38 -08:00
committed by GitHub
parent 1dcdfe9101
commit f51c26bae6
19 changed files with 54 additions and 325 deletions
+3 -9
View File
@@ -902,10 +902,8 @@ def test_capture_child_actors(ray_start_cluster):
# Kill an actor and wait until it is killed.
ray.kill(a)
try:
with pytest.raises(ray.exceptions.RayActorError):
ray.get(a.ready.remote())
except ray.exceptions.RayActorError:
pass
# Now create an actor, but do not capture the current tasks
a = Actor.options(
@@ -927,10 +925,8 @@ def test_capture_child_actors(ray_start_cluster):
# Kill an actor and wait until it is killed.
ray.kill(a)
try:
with pytest.raises(ray.exceptions.RayActorError):
ray.get(a.ready.remote())
except ray.exceptions.RayActorError:
pass
# Lastly, make sure when None is specified, actors are not scheduled
# on the same placement group.
@@ -1420,10 +1416,8 @@ ray.shutdown()
# Kill an actor and wait until it is killed.
ray.kill(a)
try:
with pytest.raises(ray.exceptions.RayActorError):
ray.get(a.ready.remote())
except ray.exceptions.RayActorError:
pass
# We should have 2 alive pgs and 4 alive actors.
assert assert_alive_num_pg(2)