Skip to content

Commit 51ea4e8

Browse files
authored
[release test] remove legacy job runner dict in glue.py (ray-project#58718)
not being used any more since a loong time ago. Signed-off-by: Lonnie Liu <lonnie@anyscale.com>
1 parent 303d366 commit 51ea4e8

File tree

2 files changed

+1
-50
lines changed

2 files changed

+1
-50
lines changed

release/ray_release/glue.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from ray_release.buildkite.output import buildkite_group, buildkite_open_last
1919
from ray_release.cloud_util import archive_directory
2020
from ray_release.cluster_manager.cluster_manager import ClusterManager
21-
from ray_release.cluster_manager.full import FullClusterManager
2221
from ray_release.cluster_manager.minimal import MinimalClusterManager
2322
from ray_release.command_runner.anyscale_job_runner import AnyscaleJobRunner
2423
from ray_release.command_runner.command_runner import CommandRunner
@@ -47,15 +46,13 @@
4746
from ray_release.reporter.reporter import Reporter
4847
from ray_release.result import Result, ResultStatus, handle_exception
4948
from ray_release.signal_handling import (
50-
register_handler,
5149
reset_signal_handling,
5250
setup_signal_handling,
5351
)
5452
from ray_release.template import get_working_dir, load_test_cluster_compute
5553
from ray_release.test import Test
5654

5755
type_str_to_command_runner = {
58-
"job": AnyscaleJobRunner,
5956
"anyscale_job": AnyscaleJobRunner,
6057
}
6158

@@ -236,12 +233,6 @@ def _local_environment_information(
236233
cluster_id: Optional[str],
237234
cluster_env_id: Optional[str],
238235
) -> None:
239-
if isinstance(cluster_manager, FullClusterManager):
240-
if not no_terminate:
241-
register_handler(
242-
lambda sig, frame: cluster_manager.terminate_cluster(wait=True)
243-
)
244-
245236
# Start cluster
246237
if cluster_id:
247238
buildkite_group(":rocket: Using existing cluster")
@@ -256,10 +247,7 @@ def _local_environment_information(
256247

257248
cluster_manager.build_configs(timeout=build_timeout)
258249

259-
if isinstance(cluster_manager, FullClusterManager):
260-
buildkite_group(":rocket: Starting up cluster")
261-
cluster_manager.start_cluster(timeout=cluster_timeout)
262-
elif isinstance(command_runner, AnyscaleJobRunner):
250+
if isinstance(command_runner, AnyscaleJobRunner):
263251
command_runner.job_manager.cluster_startup_timeout = cluster_timeout
264252

265253
result.cluster_url = cluster_manager.get_cluster_url()

release/ray_release/tests/test_glue.py

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
from ray_release.cluster_manager.full import FullClusterManager
1515
from ray_release.command_runner.command_runner import CommandRunner
1616
from ray_release.exception import (
17-
ClusterCreationError,
1817
ClusterNodesWaitTimeout,
19-
ClusterStartupError,
20-
ClusterStartupTimeout,
2118
CommandError,
2219
CommandTimeout,
2320
ExitCode,
@@ -321,40 +318,6 @@ def testInvalidClusterCompute(self):
321318
self._run(result, True)
322319
self.assertEqual(result.return_code, ExitCode.CONFIG_ERROR.value)
323320

324-
def testStartClusterFails(self):
325-
result = Result()
326-
327-
self._succeed_until("cluster_env")
328-
329-
# Fails because API response faulty
330-
with self.assertRaises(ClusterCreationError):
331-
self._run(result)
332-
self.assertEqual(result.return_code, ExitCode.CLUSTER_RESOURCE_ERROR.value)
333-
334-
self.cluster_manager_return["cluster_id"] = "valid"
335-
336-
# Fail for random cluster startup reason
337-
self.cluster_manager_return["start_cluster"] = _fail_on_call(
338-
ClusterStartupError
339-
)
340-
with self.assertRaises(ClusterStartupError):
341-
self._run(result)
342-
self.assertEqual(result.return_code, ExitCode.CLUSTER_STARTUP_ERROR.value)
343-
344-
# Ensure cluster was terminated
345-
self.assertGreaterEqual(self.sdk.call_counter["terminate_cluster"], 1)
346-
347-
# Fail for cluster startup timeout
348-
self.cluster_manager_return["start_cluster"] = _fail_on_call(
349-
ClusterStartupTimeout
350-
)
351-
with self.assertRaises(ClusterStartupTimeout):
352-
self._run(result)
353-
self.assertEqual(result.return_code, ExitCode.CLUSTER_STARTUP_TIMEOUT.value)
354-
355-
# Ensure cluster was terminated
356-
self.assertGreaterEqual(self.sdk.call_counter["terminate_cluster"], 1)
357-
358321
def testPrepareRemoteEnvFails(self):
359322
result = Result()
360323

0 commit comments

Comments
 (0)