From: Kefu Chai <kchai@redhat.com>
Date: Mon, 12 Jul 2021 05:24:14 +0000 (+0800)
Subject: qa/tasks/vstart_runner: do not send SIGTERM if no matched pid
X-Git-Tag: v17.1.0~1185^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=58841419be6eac3cf3d4d43462417385bcd4be1a;p=ceph-ci.git

qa/tasks/vstart_runner: do not send SIGTERM if no matched pid

otherwise following error is expected in some cases:

INFO:__main__:Traceback (most recent call last):
INFO:__main__:  File "/home/jenkins-build/build/workspace/ceph-api/qa/tasks/mgr/test_dashboard.py", line 18, in setUp
INFO:__main__:    self._assign_ports("dashboard", "ssl_server_port")
INFO:__main__:  File "/home/jenkins-build/build/workspace/ceph-api/qa/tasks/mgr/mgr_test_case.py", line 197, in _assign_ports
INFO:__main__:    cls.mgr_cluster.mgr_stop(mgr_id)
INFO:__main__:  File "/home/jenkins-build/build/workspace/ceph-api/qa/tasks/mgr/mgr_test_case.py", line 30, in mgr_stop
INFO:__main__:    self.mgr_daemons[mgr_id].stop()
INFO:__main__:  File "../qa/tasks/vstart_runner.py", line 558, in stop
INFO:__main__:    os.kill(pid, signal.SIGTERM)
INFO:__main__:TypeError: an integer is required (got type NoneType)

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 2b4700ccf86..16aea7c44cb 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -552,6 +552,8 @@ class LocalDaemon(object):
             return
 
         pid = self._get_pid()
+        if pid is None:
+            return
         log.debug("Killing PID {0} for {1}.{2}".format(pid, self.daemon_type, self.daemon_id))
         os.kill(pid, signal.SIGTERM)