Merge pull request #1985 from kshtsk/wip-access-denied

Fix access denied from psutil on macOS
ceph · Aug 2, 2024 · 7d7f5fe · 7d7f5fe
2 parents 8613d3f + d218c61
commit 7d7f5fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/teuthology/dispatcher/__init__.py b/teuthology/dispatcher/__init__.py
@@ -205,6 +205,8 @@ def find_dispatcher_processes() -> Dict[str, List[psutil.Process]]:
     def match(proc):
         try:
             cmdline = proc.cmdline()
+        except psutil.AccessDenied:
+            return False
         except psutil.ZombieProcess:
             return False
         if len(cmdline) < 3:

diff --git a/teuthology/kill.py b/teuthology/kill.py
@@ -223,6 +223,8 @@ def process_matches_run(pid, run_name):
             return True
     except psutil.NoSuchProcess:
         pass
+    except psutil.AccessDenied:
+        pass
     return False