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

1 Jul 2014

Antoni Segura Puimedon has uploaded a new change for review.
Change subject: split vdsm-network restoration service from vdsmd
......................................................................
split vdsm-network restoration service from vdsmd
Right now the task of doing network restoration is delegated to the
vdsmd service initialization. This has the disadvantages of:
    - Disabling vdsmd can render the machine unaccessible as the
      vdsm networks will not be started upon boot.
    - Not allowing to run it before network.target, making boot
      slower (other services may configure the nets before the
      restoration).
Change-Id: I70cdf1e8a1e7063ec850081ac6199728d4cde381
Signed-off-by: Antoni S. Puimedon asegurap@redhat.com
---
M init/systemd/Makefile.am
A init/systemd/vdsm-network.service.in
M init/vdsmd_init_common.sh.in
M vdsm/vdsm-restore-net-config
4 files changed, 50 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/29441/1

diff --git a/init/systemd/Makefile.am b/init/systemd/Makefile.am
index 4a871df..07c4ae8 100644
--- a/init/systemd/Makefile.am
+++ b/init/systemd/Makefile.am
@@ -23,8 +23,9 @@
 nodist_noinst_DATA = \
    supervdsmd.service \
    systemd-vdsmd \
-	vdsm-tmpfiles.d.conf \
    vdsmd.service \
+	vdsm-network.service \
+	vdsm-tmpfiles.d.conf \
    $(NULL)
CLEANFILES = \
@@ -35,8 +36,9 @@
 EXTRA_DIST = \
    supervdsmd.service.in \
    systemd-vdsmd.in \
-	vdsm-tmpfiles.d.conf.in \
    vdsmd.service.in \
+	vdsm-network.service.in \
+	vdsm-tmpfiles.d.conf.in \
    $(NULL)
all-local: \
diff --git a/init/systemd/vdsm-network.service.in b/init/systemd/vdsm-network.service.in
new file mode 100644
index 0000000..97aa3e2
--- /dev/null
+++ b/init/systemd/vdsm-network.service.in
@@ -0,0 +1,20 @@
+[Unit]
+Description=Virtual Desktop Server Manager network restoration
+Wants=network.target
+Before=network.target network.service NetworkManager.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=-/etc/sysconfig/vdsm
+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 --conditional
+
+# With the following two directives, we make sure that using systemctl to
+# restart will actually restore the networks
+RemainAfterExit=yes
+ExecStopPost=rm @VDSMRUN@/nets_restored
+
+[Install]
+WantedBy=multi-user.target
diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in
index e142470..327d2c3 100644
--- a/init/vdsmd_init_common.sh.in
+++ b/init/vdsmd_init_common.sh.in
@@ -189,15 +189,6 @@
 }
-task_restore_nets(){
-    local restoration_file="@VDSMRUNDIR@/nets_restored"
-    if [ ! -f "${restoration_file}" ]; then
-        "@PYTHON@" "@VDSMDIR@/vdsm-restore-net-config" || return 1
-        touch "${restoration_file}"
-    fi
-    return 0
-}
-
 task_unified_network_persistence_upgrade(){
     "$VDSM_TOOL" ${UPGRADE_LOGGING_PARAMS} upgrade-unified-persistence
 }
@@ -253,7 +244,6 @@
             test_space \
             test_lo \
             unified_network_persistence_upgrade \
-            restore_nets \
             upgrade_300_nets \
             "
         ;;
diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config
index 7adfcac..1c4a9eb 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/vdsm-restore-net-config
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python2
 #
 # Copyright 2011-2014 Red Hat, Inc.
 #
@@ -18,10 +18,14 @@
 #
 # Refer to the README and COPYING files for full details of the license
 #
+import argparse
 import logging
 import logging.config
+import os
+import sys
from vdsm.config import config
+from vdsm import constants, utils
# Ifcfg persistence restoration
 from network.configurators import ifcfg
@@ -79,11 +83,20 @@
         yield cls
-def restore():
-    if config.get('vars', 'net_persistence') == 'unified':
-        unified_restoration()
+def restore(conditional=False):
+    if conditional:
+        restoration_file = constants.P_RUN + 'nets_restored'
+        if not os.path.exists(restoration_file):
+            _restore()
+            utils.touchFile(restoration_file)
     else:
-        ifcfg_restoration()
+        _restore()
+
+
+if config.get('vars', 'net_persistence') == 'unified':
+    _restore = unified_restoration()
+else:
+    _restore = ifcfg_restoration()
if __name__ == '__main__':
@@ -95,4 +108,11 @@
                             level=logging.DEBUG)
         logging.error('Could not init proper logging', exc_info=True)
-    restore()
+    parser = argparse.ArgumentParser(
+        description="Copies the specified file to /config and then bindmounts "
+        "it back at it's original location. The file is stored with its full "
+        "path detail.")
+    parser.add_argument('--conditional', action='store_true', default=False)
+
+    arguments = parser.parse_args(sys.argv[1:])
+    restore(conditional=arguments.conditional)
-- 
To view, visit http://gerrit.ovirt.org/29441
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70cdf1e8a1e7063ec850081ac6199728d4cde381
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon asegurap@redhat.com

    

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