Correctly calculate the lists of both the sysvms to startup and the

[invirt/packages/invirt-xen-config.git] / debian / invirt-xen-config.init

diff --git a/debian/invirt-xen-config.init b/debian/invirt-xen-config.init
index 007abb1..567d7d2 100755 (executable)
--- a/debian/invirt-xen-config.init
+++ b/debian/invirt-xen-config.init
@@ -13,21 +13,66 @@ PACKAGE=invirt-xen-config
 NAME="$PACKAGE"
 DESC="Invirt Xen host"
 PARENTPACKAGE=xend
-GEN_FILES=(
-    /etc/xen/xend-config.sxp.invirt
-    /etc/xen/sysvms/s_master
-    /etc/xen/sysvms/s_remote
-    /etc/xen/sysvms/s_console
-    )
+SYSVM_TEMPLATES=(/etc/xen/sysvms/s_*.mako)
+SYSVM_FILES=("${SYSVM_TEMPLATES[@]/.mako/}")
+SYSVMS=("${SYSVM_FILES[@]/#\/etc\/xen\/sysvms\/}")
+GEN_FILES=(/etc/xen/xend-config.sxp.invirt "${SYSVM_FILES[@]}")
 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0
 
 . /lib/init/gen-files.sh
 . /lib/init/std-init.sh
 
+start_sysvm() {
+    # Attempt to start a sysvm, but only if it's not running already
+    # somewhere on the cluster
+    
+    VM="$1"
+    LV="${VM}_hda"
+    DISK="/dev/xenvg/$LV"
+    
+    # Don't bother trying to start the VM if it's already running
+    if xm list "$VM" >/dev/null 2>&1; then
+        return 1
+    fi
+    
+    RET=1
+    # To keep multiple hosts from trying to start a VM at the same
+    # time, lock VM creation at startup-time with a lock LV, since LV
+    # creation is atomic
+    if lvcreate -L 1K -n "lock_${LV}" xenvg >/dev/null 2>&1; then
+        # If we can disable the LV, then the VM isn't already running
+        # somewhere else
+        if lvchange -a n "$DISK" >/dev/null 2>&1; then
+            lvchange -a y "$DISK" >/dev/null 2>&1
+            
+            [ "$VERBOSE" != no ] && log_daemon_msg "Starting sysvm $VM"
+            xm create "sysvms/$VM" >/dev/null
+            [ "$VERBOSE" != no ] && log_end_msg $?
+            RET=0
+        fi
+        
+        # Regardless of whether we could get the lock or not, the
+        # lvchange -a n probably disabled the LV somewhere; be sure we
+        # clean up
+        lvchange -a y "$DISK" >/dev/null 2>&1
+    
+        # Cleanup the lock, regardless of whether we started the LV
+        lvchange -a n "/dev/xenvg/lock_${LV}" >/dev/null 2>&1
+        lvchange -a ey "/dev/xenvg/lock_${LV}" >/dev/null 2>&1
+        lvremove -f "/dev/xenvg/lock_${LV}" >/dev/null 2>&1
+    fi
+    
+    return $RET
+}
+
 do_startup() {
     gen_files
     
+    for vm in "${SYSVMS[@]}"; do
+        start_sysvm "$vm"
+    done
+    
     echo 1 >/proc/sys/net/ipv4/ip_forward
     for i in all default; do
         echo 1 >/proc/sys/net/ipv4/conf/$i/rp_filter