Yaniv Bronhaim has uploaded a new change for review.
Change subject: Remove deathSignal usages in sync execCmd calls
......................................................................
Remove deathSignal usages in sync execCmd calls
Once moving to systemctl, when vdsm dies all subprocesses will signaled.
Change-Id: I3e5c39fd212429a9b123f4ef9f386db2e91330d0
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M lib/vdsm/qemuimg.py
M vdsm/storage/curlImgWrap.py
M vdsm/storage/misc.py
M vdsm/storage/storage_mailbox.py
4 files changed, 4 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/52646/1
diff --git a/lib/vdsm/qemuimg.py b/lib/vdsm/qemuimg.py
index 4a75428..18a58cd 100644
--- a/lib/vdsm/qemuimg.py
+++ b/lib/vdsm/qemuimg.py
@@ -298,7 +298,7 @@
cmd.extend(("-f", format))
cmd.extend((image, str(newSize)))
- rc, out, err = commands.execCmd(cmd, deathSignal=signal.SIGKILL)
+ rc, out, err = commands.execCmd(cmd)
if rc != 0:
raise QImgError(rc, out, err)
diff --git a/vdsm/storage/curlImgWrap.py b/vdsm/storage/curlImgWrap.py
index b8dfa48..3c47fa9 100644
--- a/vdsm/storage/curlImgWrap.py
+++ b/vdsm/storage/curlImgWrap.py
@@ -18,8 +18,6 @@
# Refer to the README and COPYING files for full details of the license
#
-import signal
-
from vdsm import commands
from vdsm import constants
from vdsm import utils
@@ -67,7 +65,7 @@
cmd = [constants.EXT_CURL_IMG_WRAP, "--download"]
cmd.extend(_headersToOptions(headers) + [path, url])
- rc, out, err = commands.execCmd(cmd, deathSignal=signal.SIGKILL)
+ rc, out, err = commands.execCmd(cmd)
if rc != 0:
raise CurlError(rc, out, err)
@@ -77,7 +75,7 @@
cmd = [constants.EXT_CURL_IMG_WRAP, "--upload"]
cmd.extend(_headersToOptions(headers) + [path, url])
- rc, out, err = commands.execCmd(cmd, deathSignal=signal.SIGKILL)
+ rc, out, err = commands.execCmd(cmd)
if rc != 0:
raise CurlError(rc, out, err)
diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py
index f9b3865..0b5583c 100644
--- a/vdsm/storage/misc.py
+++ b/vdsm/storage/misc.py
@@ -38,7 +38,6 @@
import Queue
import random
import re
-import signal
import string
import struct
import threading
@@ -341,8 +340,7 @@
if not stop:
(rc, out, err) = execCmd(cmd, nice=utils.NICENESS.HIGH,
- ioclass=utils.IOCLASS.IDLE,
- deathSignal=signal.SIGKILL)
+ ioclass=utils.IOCLASS.IDLE)
else:
(rc, out, err) = watchCmd(cmd, stop=stop,
nice=utils.NICENESS.HIGH,
diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py
index b30fbab..8f75333 100644
--- a/vdsm/storage/storage_mailbox.py
+++ b/vdsm/storage/storage_mailbox.py
@@ -24,7 +24,6 @@
import threading
import Queue
import struct
-import signal
import logging
import uuid
@@ -80,7 +79,6 @@
def _mboxExecCmd(*args, **kwargs):
- kwargs['deathSignal'] = signal.SIGKILL
return misc.execCmd(*args, **kwargs)
--
To view, visit https://gerrit.ovirt.org/52646
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e5c39fd212429a9b123f4ef9f386db2e91330d0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
