From: Patrick Donnelly <pdonnell@ibm.com>
Date: Sat, 9 May 2026 00:01:59 +0000 (-0400)
Subject: Merge PR #67465 into tentacle
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f1c26068bbee18c882daa062c0d0b50c4c85ffc;p=ceph.git

Merge PR #67465 into tentacle

* refs/pull/67465/head:
	mgr: isolated CherryPy to prevent global state sharing
	Fix the prometheus module crash

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
---

0f1c26068bbee18c882daa062c0d0b50c4c85ffc
diff --cc src/pybind/mgr/cephadm/agent.py
index 823ea97648c7,1568d003e59d..4c3bda4ebc98
--- a/src/pybind/mgr/cephadm/agent.py
+++ b/src/pybind/mgr/cephadm/agent.py
@@@ -23,10 -15,9 +15,10 @@@ from mgr_util import test_port_allocati
  from mgr_util import verify_tls_files
  import tempfile
  from cephadm.services.service_registry import service_registry
 +from cephadm.utils import get_node_proxy_status_value
  
  from urllib.error import HTTPError, URLError
- from typing import Any, Dict, List, Set, TYPE_CHECKING, Optional, MutableMapping, IO
+ from typing import Any, Dict, List, Set, TYPE_CHECKING, Optional, MutableMapping, IO, Tuple
  
  if TYPE_CHECKING:
      from cephadm.module import CephadmOrchestrator