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

Signed-off-by: Mark McLoughlin <markmc@redhat.com>

vllm/v1/utils.py

@@ -220,10 +220,8 @@ class APIServerProcessManager:
         # The extra processes are managed by their owners
         self._finalizer = weakref.finalize(self, shutdown, self.processes)
 
-    def shutdown(self, timeout: float | None = None) -> None:
-        """Shutdown API server processes with configurable timeout"""
-        if self._finalizer.detach() is not None:
-            shutdown(self.processes, timeout=timeout)
+    def close(self) -> None:
+        self._finalizer()
 
 
 def wait_for_completion_or_failure(
@@ -290,30 +288,25 @@ def wait_for_completion_or_failure(
     except Exception as e:
         logger.exception("Exception occurred while running API servers: %s", str(e))
         raise
+    finally:
+        logger.info("Terminating remaining processes ...")
+        api_server_manager.close()
+        if coordinator:
+            coordinator.close()
+        if engine_manager:
+            engine_manager.close()
 
 
 # Note(rob): shutdown function cannot be a bound method,
 # else the gc cannot collect the object.
-def shutdown(procs: list[BaseProcess], timeout: float | None = None) -> None:
-    """Shutdown processes with timeout.
-
-    Args:
-        procs: List of processes to shutdown
-        timeout: Maximum time in seconds to wait for graceful shutdown
-    """
-    if timeout is None:
-        timeout = 0.0
-
-    # Allow at least 5 seconds for remaining procs to terminate.
-    timeout = max(timeout, 5.0)
-
+def shutdown(procs: list[BaseProcess]):
     # Shutdown the process.
     for proc in procs:
         if proc.is_alive():
             proc.terminate()
 
-    # Allow time for remaining procs to terminate.
-    deadline = time.monotonic() + timeout
+    # Allow 5 seconds for remaining procs to terminate.
+    deadline = time.monotonic() + 5
     for proc in procs:
         remaining = deadline - time.monotonic()
         if remaining <= 0: