Catch Timeout exception when stopping endpoints instead of printing

stack trace

[sc-45767]

Author: LeiGlobus

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
   hooks:
     - id: ruff-check
       types_or: [ python ]
-      args: [ --select, I ]
+      args: [ --fix, --select, I ]
     - id: ruff-check
       types_or: [ python ]
       args: [ --fix, --select, I ]

README.rst

@@ -55,4 +55,3 @@ Documentation
 =============
 
 Complete documentation for Globus Compute is available `here <https://globus-compute.readthedocs.io>`_
-

changelog.d/20260518_144358_lei_forced_del_err_sc_45767.rst

@@ -0,0 +1,6 @@
+Bug Fixes
+^^^^^^^^^
+
+- When force deleting an endpoint, a Timeout exception may be raised when waiting for the parent
+  Endpoint process to terminate.  This is not user-friendly, the stacktrace is now replaced with
+  a more readable message to repeat the deletion command.

compute_endpoint/globus_compute_endpoint/endpoint/endpoint.py

@@ -661,7 +661,14 @@ def stop_endpoint(
 
             # Give parent process chance to clean itself up
             parent.terminate()
-            parent.wait(timeout=grace_period_s)
+            try:
+                parent.wait(timeout=grace_period_s)
+            except psutil.TimeoutExpired:
+                log.warning(
+                    f"Encountered timeout attempting to stop endpoint {ep_name},"
+                    " Please try deleting the endpoint again with the --force flag"
+                )
+                sys.exit(-1)
 
             # After grace period, give children 1 second, before pulling the plug
             terminated, alive = psutil.wait_procs(processes, timeout=grace_period_s)

compute_endpoint/tests/integration/endpoint/endpoint/test_endpoint.py

@@ -4,6 +4,7 @@
 import shutil
 from unittest import mock
 
+import psutil
 import pytest
 import requests
 import responses
@@ -157,6 +158,25 @@ def test_endpoint_teardown_execution(mocker, tmp_path, randomstring):
     assert tmp_file_content in info_txt
 
 
+def test_endpoint_psutil_timeout(conf_dir, mocker, ep_uuid):
+    mocker.patch.object(endpoint.Endpoint, "stop_endpoint")
+    mocker.patch.object(shutil, "rmtree")
+
+    endpoint.Endpoint.configure_endpoint(conf_dir, None)
+
+    mock_gcc = mocker.Mock()
+    mocker.patch(f"{_MOCK_BASE}Endpoint.get_funcx_client").return_value = mock_gcc
+
+    mock_gcc.get_endpoint_status.return_value = {"status": "online"}
+
+    mock_psutil = mocker.patch(f"{_MOCK_BASE}psutil.Process")
+    mock_psutil.return_value.wait.side_effect = psutil.TimeoutExpired(10)
+
+    endpoint.Endpoint.delete_endpoint(
+        conf_dir, ep_config=None, force=True, ep_uuid=ep_uuid
+    )
+
+
 @pytest.mark.parametrize("web_svc_ok", (True, False))
 @pytest.mark.parametrize("force", (True, False))
 def test_delete_endpoint(conf_dir, mocker, web_svc_ok, force, ep_uuid):