Change in vdsm[master]: Sending sigkill to verify svdsm suicide

ybronhei at redhat.com ybronhei at redhat.com
Mon Nov 12 16:34:37 UTC 2012


Yaniv Bronhaim has uploaded a new change for review.

Change subject: Sending sigkill to verify svdsm suicide
......................................................................

Sending sigkill to verify svdsm suicide

Svdsm was alive after restart of vdsm. svdsm should use pokeParent
thread to distinguish vdsm pid status, when it recognizes that vdsm pid
is not exist, svdsm kills itself by sending SIGKILL.

The patch changes the signal to SIGKILL and verifies that in the except
scope we won't get exception before calling to os.kill.

Change-Id: I2eb8f1a74f818cd10a08572c9adb5de1c0e21f5a
Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=875486
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M vdsm/supervdsmServer.py
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/9196/1

diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py
index a1bf8e6..0836b1b 100755
--- a/vdsm/supervdsmServer.py
+++ b/vdsm/supervdsmServer.py
@@ -293,8 +293,9 @@
             os.kill(parentPid, 0)
             sleep(2)
     except Exception:
-        os.unlink(ADDRESS)
-        os.kill(os.getpid(), signal.SIGTERM)
+        if os.path.exists(ADDRESS):
+            os.unlink(ADDRESS)
+        os.kill(os.getpid(), signal.SIGKILL)
 
 
 def main():


--
To view, visit http://gerrit.ovirt.org/9196
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2eb8f1a74f818cd10a08572c9adb5de1c0e21f5a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>


More information about the vdsm-patches mailing list