[Frontend][Core] Revert "Add shutdown timeout" (#34730 and #36270) (#36628)

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
This commit is contained in:
Mark McLoughlin
2026-03-10 13:20:41 +00:00
committed by GitHub
parent c88510083b
commit 234860399b
14 changed files with 95 additions and 761 deletions

View File

@@ -79,7 +79,7 @@ def test_api_server_process_manager_init(api_server_args, with_stats_update):
finally:
# Always clean up the processes
print("Cleaning up processes...")
manager.shutdown()
manager.close()
# Give processes time to terminate
time.sleep(0.2)
@@ -111,8 +111,6 @@ def test_wait_for_completion_or_failure(api_server_args):
wait_for_completion_or_failure(api_server_manager=manager)
except Exception as e:
result["exception"] = e
finally:
manager.shutdown()
# Start a thread to run wait_for_completion_or_failure
wait_thread = threading.Thread(target=run_with_exception_capture, daemon=True)
@@ -145,7 +143,7 @@ def test_wait_for_completion_or_failure(api_server_args):
assert not proc.is_alive(), f"Process {i} should not be alive"
finally:
manager.shutdown()
manager.close()
time.sleep(0.2)
@@ -176,14 +174,11 @@ def test_normal_completion(api_server_args):
# since all processes have already
# terminated, it should return immediately
# with no error
try:
wait_for_completion_or_failure(api_server_manager=manager)
finally:
manager.shutdown()
wait_for_completion_or_failure(api_server_manager=manager)
finally:
# Clean up just in case
manager.shutdown()
manager.close()
time.sleep(0.2)
@@ -206,7 +201,7 @@ def test_external_process_monitoring(api_server_args):
def __init__(self, proc):
self.proc = proc
def shutdown(self):
def close(self):
if self.proc.is_alive():
self.proc.terminate()
self.proc.join(timeout=0.5)
@@ -231,9 +226,6 @@ def test_external_process_monitoring(api_server_args):
)
except Exception as e:
result["exception"] = e
finally:
manager.shutdown()
mock_coordinator.shutdown()
# Start a thread to run wait_for_completion_or_failure
wait_thread = threading.Thread(target=run_with_exception_capture, daemon=True)
@@ -267,6 +259,6 @@ def test_external_process_monitoring(api_server_args):
finally:
# Clean up
manager.shutdown()
mock_coordinator.shutdown()
manager.close()
mock_coordinator.close()
time.sleep(0.2)