Merge "Init default lvm volume group only if required"

Jenkins · openstack-gerrit · commit d84d93d8ae34 · 2015-01-29T22:55:50.000Z
diff --git a/lib/cinder b/lib/cinder
@@ -393,6 +393,10 @@ function init_cinder {
             fi
 
             if type init_cinder_backend_${be_type} >/dev/null 2>&1; then
+                # Always init the default volume group for lvm.
+                if [[ "$be_type" == "lvm" ]]; then
+                    init_default_lvm_volume_group
+                fi
                 init_cinder_backend_${be_type} ${be_name}
             fi
         done
diff --git a/lib/lvm b/lib/lvm
@@ -117,6 +117,25 @@ function init_lvm_volume_group {
     _clean_lvm_volume_group $vg
 }
 
+# Sentinal value to ensure that init of default lvm volume group is
+# only performed once across calls of init_default_lvm_volume_group.
+_DEFAULT_LVM_INIT=${_DEFAULT_LVM_INIT:-0}
+
+# init_default_lvm_volume_group() initializes a default volume group
+# intended to be shared between cinder and nova.  It is idempotent;
+# the init of the default volume group is guaranteed to be performed
+# only once so that either or both of the dependent services can
+# safely call this function.
+#
+# Usage: init_default_lvm_volume_group()
+function init_default_lvm_volume_group {
+    if [[ "$_DEFAULT_LVM_INIT" = "0" ]]; then
+        init_lvm_volume_group $DEFAULT_VOLUME_GROUP_NAME $VOLUME_BACKING_FILE_SIZE
+        _DEFAULT_LVM_INIT=1
+    fi
+}
+
+
 # Restore xtrace
 $MY_XTRACE
 
diff --git a/lib/nova b/lib/nova
@@ -640,6 +640,10 @@ function init_nova {
 
     create_nova_cache_dir
     create_nova_keys_dir
+
+    if [[ "$NOVA_BACKEND" == "LVM" ]]; then
+        init_default_lvm_volume_group
+    fi
 }
 
 # install_novaclient() - Collect source and prepare
diff --git a/stack.sh b/stack.sh
@@ -918,10 +918,6 @@ init_service_check
 # A better kind of sysstat, with the top process per time slice
 start_dstat
 
-# Initialize default LVM volume group
-# -----------------------------------
-init_lvm_volume_group $DEFAULT_VOLUME_GROUP_NAME $VOLUME_BACKING_FILE_SIZE
-
 # Start Services
 # ==============
 

Original file line number	Diff line number	Diff line change
`@@ -640,6 +640,10 @@ function init_nova {`
`640`	`640`
`641`	`641`	`create_nova_cache_dir`
`642`	`642`	`create_nova_keys_dir`
	`643`	`+`
	`644`	`+ if [[ "$NOVA_BACKEND" == "LVM" ]]; then`
	`645`	`+ init_default_lvm_volume_group`
	`646`	`+ fi`
`643`	`647`	`}`
`644`	`648`
`645`	`649`	`# install_novaclient() - Collect source and prepare`