Change in vdsm[ovirt-3.5]: Prevent systemd to kill dhclient once vdsm-network service i...

ibarkan at redhat.com ibarkan at redhat.com
Thu Mar 26 06:21:13 UTC 2015


Hello Dan Kenigsberg,

I'd like you to do a code review.  Please visit

    https://gerrit.ovirt.org/39213

to review the following change.

Change subject: Prevent systemd to kill dhclient once vdsm-network service is stopped
......................................................................

Prevent systemd to kill dhclient once vdsm-network service is stopped

When upgrading VDSM or for that matter, stopping vdsm-network process,
systemd would kill all the descendants of the service (including dhclient).
When vdsm-network starts again, it discovers /var/run/vdsm/nets_restored and
does not restore any network, possibly leaving the system with interfaces
that have an IP with a timer but no dhclient to renew it. Adding
KillMode=Process tells systemd to only kill the service main process and
nothing more.

Change-Id: Ie77d3448c2144b94194ccbe37995fcca008430dc
Bug-Url: https://bugzilla.redhat.com/1204782
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/39137
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M init/systemd/vdsm-network.service.in
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/39213/1

diff --git a/init/systemd/vdsm-network.service.in b/init/systemd/vdsm-network.service.in
index d863f1b..8315187 100644
--- a/init/systemd/vdsm-network.service.in
+++ b/init/systemd/vdsm-network.service.in
@@ -10,7 +10,8 @@
 ExecStartPre=@BINDIR@/vdsm-tool --vvverbose --append --logfile=@VDSMLOGDIR@/upgrade.log upgrade-unified-persistence
 ExecStartPre=@BINDIR@/vdsm-tool --vvverbose --append --logfile=@VDSMLOGDIR@/upgrade.log upgrade-3.0.0-networks
 ExecStart=@VDSMDIR@/vdsm-restore-net-config
+KillMode=process
 RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target


-- 
To view, visit https://gerrit.ovirt.org/39213
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie77d3448c2144b94194ccbe37995fcca008430dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list