Add support for locking based on LVM volume uuid

diff --git a/src/locking/libvirt_lockd.aug b/src/locking/libvirt_lockd.aug
index dafd8f9d0b73b478a9b855494b4c63c6a69731f9..347386279688f613f81f6d3aaf1cee6f14b32831 100644 (file)
--- a/src/locking/libvirt_lockd.aug
+++ b/src/locking/libvirt_lockd.aug
@@ -20,6 +20,7 @@ module Libvirt_lockd =
    let entry = bool_entry "auto_disk_leases"
              | bool_entry "require_lease_for_disks"
              | str_entry "file_lockspace_dir"
+            | str_entry "lvm_lockspace_dir"
    let comment = [ label "#comment" . del /#[ \t]*/ "# " .  store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ]
    let empty = [ label "#empty" . eol ]
 

diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index aa0f94a4641c67b4d42fd8e88e477ea760e030e8..e9f9071f8b4c21b897153b4266c9120c13437fd8 100644 (file)
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -73,6 +73,7 @@ struct _virLockManagerLockDaemonDriver {
     bool requireLeaseForDisks;
 
     char *fileLockSpaceDir;
+    char *lvmLockSpaceDir;
 };
 
 static virLockManagerLockDaemonDriverPtr driver = NULL;
@@ -134,6 +135,17 @@ static int virLockManagerLockDaemonLoadConfig(const char *configFile)
         }
     }
 
+    p = virConfGetValue(conf, "lvm_lockspace_dir");
+    CHECK_TYPE("lvm_lockspace_dir", VIR_CONF_STRING);
+    if (p && p->str) {
+        VIR_FREE(driver->lvmLockSpaceDir);
+        if (!(driver->lvmLockSpaceDir = strdup(p->str))) {
+            virReportOOMError();
+            virConfFree(conf);
+            return -1;
+        }
+    }
+
     p = virConfGetValue(conf, "require_lease_for_disks");
     CHECK_TYPE("require_lease_for_disks", VIR_CONF_LONG);
     if (p)
@@ -371,8 +383,11 @@ static int virLockManagerLockDaemonInit(unsigned int version,
         if (driver->fileLockSpaceDir &&
             virLockManagerLockDaemonSetupLockspace(driver->fileLockSpaceDir) < 0)
             goto error;
-    }
 
+        if (driver->lvmLockSpaceDir &&
+            virLockManagerLockDaemonSetupLockspace(driver->lvmLockSpaceDir) < 0)
+            goto error;
+    }
 
     return 0;
 
@@ -546,6 +561,26 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
             return 0;
         }
 
+        /* XXX we should somehow pass in TYPE=BLOCK info
+         * from the domain_lock code, instead of assuming /dev
+         */
+        if (STRPREFIX(name, "/dev") &&
+            driver->lvmLockSpaceDir) {
+            VIR_DEBUG("Trying to find an LVM UUID for %s", name);
+            if (virStorageFileGetLVMKey(name, &newName) < 0)
+                goto error;
+
+            if (newName) {
+                VIR_DEBUG("Got an LVM UUID %s for %s", newName, name);
+                if (!(newLockspace = strdup(driver->lvmLockSpaceDir)))
+                    goto no_memory;
+                autoCreate = true;
+                break;
+            }
+            virResetLastError();
+            /* Fallback to generic non-block code */
+        }
+
         if (driver->fileLockSpaceDir) {
             if (!(newLockspace = strdup(driver->fileLockSpaceDir)))
                 goto no_memory;
@@ -623,6 +658,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
 
 no_memory:
     virReportOOMError();
+error:
     VIR_FREE(newLockspace);
     VIR_FREE(newName);
     return -1;

diff --git a/src/locking/lockd.conf b/src/locking/lockd.conf
index 7545fd97ee06dc58476349af7b51926c73ca307e..00f9b495e1afb2d44bb8419ee4336767fbd89180 100644 (file)
--- a/src/locking/lockd.conf
+++ b/src/locking/lockd.conf
@@ -38,3 +38,17 @@
 # storage.
 #
 #file_lockspace_dir = "/var/lib/libvirt/lockd/files"
+
+
+#
+# When using LVM volumes that can be visible across
+# multiple, it is desirable to do locking based on
+# the unique UUID associated with each volume, instead
+# of their paths. Setting this path causes libvirt to
+# do UUID based locking for LVM.
+#
+# Typically this directory would be located on a shared
+# filesystem visible to all hosts accessing the same
+# storage.
+#
+#lvm_lockspace_dir = "/var/lib/libvirt/lockd/lvmvolumes"

diff --git a/src/locking/test_libvirt_lockd.aug.in b/src/locking/test_libvirt_lockd.aug.in
index 2e65af62175f3d93c12782e09ee979725e1b617f..25cba68c071d9b1b7bbf99322c43dca9f7927ee8 100644 (file)
--- a/src/locking/test_libvirt_lockd.aug.in
+++ b/src/locking/test_libvirt_lockd.aug.in
@@ -5,3 +5,4 @@ module Test_libvirt_lockd =
 { "auto_disk_leases" = "0" }
 { "require_lease_for_disks" = "1" }
 { "file_lockspace_dir" = "/var/lib/libvirt/lockd/files" }
+{ "lvm_lockspace_dir" = "/var/lib/libvirt/lockd/lvmvolumes" }