Yeela Kaplan has uploaded a new change for review. Change subject: oop: close ioprocesses on vdsmd stop ......................................................................
oop: close ioprocesses on vdsmd stop Send SIGTERM only to main vdsm service. All child processes will be closed as part of prepareForShutdown. Change-Id: I5a7554609e5b43d6fce3dd3c4c1817cc98372b6c Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1189200 Signed-off-by: Yeela Kaplan <[email protected]> --- M init/systemd/vdsmd.service.in M vdsm/storage/hsm.py M vdsm/storage/outOfProcess.py 3 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/45038/1 diff --git a/init/systemd/vdsmd.service.in b/init/systemd/vdsmd.service.in index d7d025f..471905e 100644 --- a/init/systemd/vdsmd.service.in +++ b/init/systemd/vdsmd.service.in @@ -21,6 +21,7 @@ Group=@VDSMGROUP@ PermissionsStartOnly=true TimeoutStopSec=@SERVICE_STOP_TIMEOUT@ +KillMode=process [Install] WantedBy=multi-user.target diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 0806abb..b424088 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -3452,6 +3452,8 @@ exc_info=True) self.taskMng.prepareForShutdown() + + oop.closeAllIOProcesses() except: pass diff --git a/vdsm/storage/outOfProcess.py b/vdsm/storage/outOfProcess.py index 19eb546..5cb99b2 100644 --- a/vdsm/storage/outOfProcess.py +++ b/vdsm/storage/outOfProcess.py @@ -75,6 +75,9 @@ if (eol < now and name != clientName): del _procPool[name] +def closeAllIOProcesses(): + for name, (eol, proc) in _procPool.items(): + proc.close() def _getRfhPool(clientName): with _procPoolLock: -- To view, visit https://gerrit.ovirt.org/45038 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a7554609e5b43d6fce3dd3c4c1817cc98372b6c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
