Change in vdsm[master]: split network restoration from vdsmd.service

danken at redhat.com danken at redhat.com
Mon Mar 23 12:48:05 UTC 2015


Dan Kenigsberg 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.

Bug-Url: https://bugzilla.redhat.com/1187244
Change-Id: I70cdf1e8a1e7063ec850081ac6199728d4cde381
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/29441
Reviewed-by: Dan Kenigsberg <danken 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, 87 insertions(+), 28 deletions(-)

Approvals:
  Ido Barkan: Verified
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70cdf1e8a1e7063ec850081ac6199728d4cde381
Gerrit-PatchSet: 20
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <toni+ovirt at midokura.com>
Gerrit-Reviewer: Antoni Segura Puimedon <toni+ovirt at midokura.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Dima Kuznetsov <dkuznets at redhat.com>
Gerrit-Reviewer: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Ondřej Svoboda <osvoboda at redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server


More information about the vdsm-patches mailing list