Skip to content

Commit 2ed965d

Browse files
committed
[release test] remove legacy job runner dict in glue.py
Signed-off-by: Lonnie Liu <[email protected]>
1 parent ae94ff4 commit 2ed965d

File tree

2 files changed

+1
-49
lines changed

2 files changed

+1
-49
lines changed

release/ray_release/glue.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
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
25-
from ray_release.command_runner.job_runner import JobRunner
2624
from ray_release.config import (
2725
DEFAULT_AUTOSUSPEND_MINS,
2826
DEFAULT_BUILD_TIMEOUT,
@@ -48,20 +46,17 @@
4846
from ray_release.reporter.reporter import Reporter
4947
from ray_release.result import Result, ResultStatus, handle_exception
5048
from ray_release.signal_handling import (
51-
register_handler,
5249
reset_signal_handling,
5350
setup_signal_handling,
5451
)
5552
from ray_release.template import get_working_dir, load_test_cluster_compute
5653
from ray_release.test import Test
5754

5855
type_str_to_command_runner = {
59-
"job": JobRunner,
6056
"anyscale_job": AnyscaleJobRunner,
6157
}
6258

6359
command_runner_to_cluster_manager = {
64-
JobRunner: FullClusterManager,
6560
AnyscaleJobRunner: MinimalClusterManager,
6661
}
6762

@@ -238,12 +233,6 @@ def _local_environment_information(
238233
cluster_id: Optional[str],
239234
cluster_env_id: Optional[str],
240235
) -> None:
241-
if isinstance(cluster_manager, FullClusterManager):
242-
if not no_terminate:
243-
register_handler(
244-
lambda sig, frame: cluster_manager.terminate_cluster(wait=True)
245-
)
246-
247236
# Start cluster
248237
if cluster_id:
249238
buildkite_group(":rocket: Using existing cluster")
@@ -258,10 +247,7 @@ def _local_environment_information(
258247

259248
cluster_manager.build_configs(timeout=build_timeout)
260249

261-
if isinstance(cluster_manager, FullClusterManager):
262-
buildkite_group(":rocket: Starting up cluster")
263-
cluster_manager.start_cluster(timeout=cluster_timeout)
264-
elif isinstance(command_runner, AnyscaleJobRunner):
250+
if isinstance(command_runner, AnyscaleJobRunner):
265251
command_runner.job_manager.cluster_startup_timeout = cluster_timeout
266252

267253
result.cluster_url = cluster_manager.get_cluster_url()

release/ray_release/tests/test_glue.py

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -321,40 +321,6 @@ def testInvalidClusterCompute(self):
321321
self._run(result, True)
322322
self.assertEqual(result.return_code, ExitCode.CONFIG_ERROR.value)
323323

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-
358324
def testPrepareRemoteEnvFails(self):
359325
result = Result()
360326

0 commit comments

Comments
 (0)