Check PID within the namespace

PID filtering should only happen within current namespace
openstack-charmers · Oct 16, 2018 · d14b5ac · d14b5ac
1 parent b399694
commit d14b5ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/unit_tests/test_zaza_model.py b/unit_tests/test_zaza_model.py
@@ -708,7 +708,7 @@ async def _run_on_unit(
         self.async_run_on_unit.side_effect = _run_on_unit
         self.assertEqual(
             model.get_unit_service_start_time('app/2', 'mysvc1'), 1524409654)
-        cmd = "stat -c %Y /proc/$(pidof -x mysvc1 | cut -f1 -d ' ')"
+        cmd = "stat -c %Y /proc/$(pgrep mysvc1 --nslist pid --ns 1 | head -n1)"
         self.async_run_on_unit.assert_called_once_with(
             unit_name='app/2',
             command=cmd,

diff --git a/zaza/model.py b/zaza/model.py
@@ -323,7 +323,8 @@ async def async_get_unit_service_start_time(unit_name, service,
     :rtype: int
     :raises: ServiceNotRunning
     """
-    cmd = "stat -c %Y /proc/$(pidof -x {} | cut -f1 -d ' ')".format(service)
+    cmd = ("stat -c %Y /proc/$(pgrep {} --nslist pid"
+           " --ns 1 | head -n1)").format(service)
     out = await async_run_on_unit(
         unit_name=unit_name,
         command=cmd,