Change in vdsm[master]: Unified persistence [3/4] - Restore network config

danken at redhat.com danken at redhat.com
Thu Oct 24 14:30:16 UTC 2013


Dan Kenigsberg has submitted this change and it was merged.

Change subject: Unified persistence [3/4] - Restore network config
......................................................................


Unified persistence [3/4] - Restore network config

Add vdsm-restore-net-config support for unified persistence.
It relies on flushing of configurator-specific persistence, i.e.,
each configurator should remove its persisted conf, leaving
only unified persistence as source of persistence.

After the configurator persistence is flushed, the unified
persisted nets and bonds are passed to a setupNetworks call.

Since we want vdsm-restore-net-config to be run at boot after
libvirtd but before vdsmd listens, the service was removed
and it was integrated as one of the start tasks. However, we
must run vdsm-restore-net-config only during boot time, and
not on every vdsmd restart.

If the restoration is run via vdsmd_init_common.sh we touch
/var/run/vdsm/nets_restored that, if present, marks to future
vdsmd restarts that service boot-time network restoration is
no longer expected nor in order.

The user can explicitly restore the nets by calling
/usr/share/vdsm/vdsm-restore-net-config or via vdsm-tool:
vdsm-tool restore-nets

Change-Id: I73462b160ecfbaa7efe71eed905a3bbd69ee6c23
Signed-off-by: Assaf Muller <amuller at redhat.com>
Signed-off-by: Antoni S. Puimedon <asegurap at redhat.com>
Reviewed-on: http://gerrit.ovirt.org/17010
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
Tested-by: Dan Kenigsberg <danken at redhat.com>
---
M .gitignore
M debian/rules
M debian/vdsm.install
M init/systemd/Makefile.am
D init/systemd/vdsm-restore-net-config.service
M init/sysvinit/Makefile.am
D init/sysvinit/vdsm-restore-net-config.init.in
M init/upstart/Makefile.am
D init/upstart/vdsm-restore-net-config.upstart.in
M init/vdsmd_init_common.sh.in
M lib/vdsm/netconfpersistence.py
M lib/vdsm/tool/Makefile.am
A lib/vdsm/tool/restore_nets.py
M tests/functional/networkTests.py
M tests/functional/utils.py
M vdsm.spec.in
M vdsm/netconf/ifcfg.py
M vdsm/netconf/libvirtCfg.py
M vdsm/supervdsmServer
M vdsm/vdsm-restore-net-config
20 files changed, 181 insertions(+), 155 deletions(-)

Approvals:
  Dan Kenigsberg: Verified; Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/17010
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I73462b160ecfbaa7efe71eed905a3bbd69ee6c23
Gerrit-PatchSet: 35
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Assaf Muller <amuller at redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap at redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Giuseppe Vallarelli <gvallare at redhat.com>
Gerrit-Reviewer: Livnat Peer <lpeer at redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw at linux.vnet.ibm.com>
Gerrit-Reviewer: Petr Ĺ ebek <psebek at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server


More information about the vdsm-patches mailing list