Change in vdsm[ovirt-3.5]: split network restoration from vdsmd.service

ybronhei at redhat.com ybronhei at redhat.com
Tue Mar 24 16:27:25 UTC 2015


Yaniv Bronhaim has submitted this change and it was merged.

Change subject: split network restoration from vdsmd.service
......................................................................


split network restoration from vdsmd.service

Right now the task of doing network restoration is delegated to the vdsmd
service initialization. Since systemd does not expect that a long lived deamon
such as dhclient will stay alive after ExecStartPre stage, it might kill
dhclient, if that was spawned on dhcp persistent interfaces.

This patch splits systemd vdsm service into 2 dependant units:
1. vdsm-network.service which
   upgrades unified persistence and 3.0.0 networks if needed and then restore
   networks as its main mission

2. vdsmd.service which reconfigures the persistent network configuration of
   vdsm using the configured net_configurator

Note that from now on, disabling vdsmd cannot render the machine inaccessible
as the vdsm networks will be started upon boot. Note also that since it is
inconvenient to implement logic on service files, vdsm-restore-net-config
learned how to no-op when nets_restored mark exists and this functionality was
removed from the bash part.

Change-Id: Idf120b6f5405b6c747cd6a0b2a33f347ea9d0772
Bug-Url: https://bugzilla.redhat.com/1204782
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/39081
Reviewed-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M .gitignore
M init/systemd/Makefile.am
A init/systemd/vdsm-network.service.in
M init/systemd/vdsmd.service.in
M init/sysvinit/vdsmd.init.in
M init/vdsmd_init_common.sh.in
M lib/vdsm/tool/restore_nets.py
M vdsm.spec.in
M vdsm/vdsm-restore-net-config
9 files changed, 85 insertions(+), 26 deletions(-)

Approvals:
  Ido Barkan: Verified
  Yaniv Bronhaim: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf120b6f5405b6c747cd6a0b2a33f347ea9d0772
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: automation at ovirt.org


More information about the vdsm-patches mailing list