Move error message to locking constructor and print

more descriptive message if locking fails instead of
"Locking type -1 initialisation failed."

Use read-only locking instead of misleading ignorelocking option
in message.

diff --git a/WHATS_NEW b/WHATS_NEW
index 4969c246a2517a676e1c56083a14fad3d0422f4a..9c3583eaa9323ffc083356abc5341214ab1350af 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.60
 ===================================
+  Fix failed locking messages to be more descriptive.
 
 Version 2.02.59 - 21st January 2010
 ===================================

diff --git a/lib/locking/locking.c b/lib/locking/locking.c
index a2c6a3e8eac87eadfb90a24d08dade243fc98db2..54e5e25ae5112d909a8d3acbce895d96b67af82c 100644 (file)
--- a/lib/locking/locking.c
+++ b/lib/locking/locking.c
@@ -224,7 +224,7 @@ int init_locking(int type, struct cmd_context *cmd)
 
        _blocking_supported = find_config_tree_int(cmd,
            "global/wait_for_locks", DEFAULT_WAIT_FOR_LOCKS);
-       
+
        switch (type) {
        case 0:
                init_no_locking(&_locking, cmd);
@@ -236,8 +236,10 @@ int init_locking(int type, struct cmd_context *cmd)
                log_very_verbose("%sFile-based locking selected.",
                                 _blocking_supported ? "" : "Non-blocking ");
 
-               if (!init_file_locking(&_locking, cmd))
+               if (!init_file_locking(&_locking, cmd)) {
+                       log_error("File-based locking initialisation failed.");
                        break;
+               }
                return 1;
 
 #ifdef HAVE_LIBDL
@@ -249,8 +251,10 @@ int init_locking(int type, struct cmd_context *cmd)
                }
                if (!find_config_tree_int(cmd, "locking/fallback_to_clustered_locking",
                            find_config_tree_int(cmd, "global/fallback_to_clustered_locking",
-                                                DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING)))
+                                                DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING))) {
+                       log_error("External locking initialisation failed.");
                        break;
+               }
 #endif
 
 #ifdef CLUSTER_LOCKING_INTERNAL
@@ -259,8 +263,10 @@ int init_locking(int type, struct cmd_context *cmd)
 
        case 3:
                log_very_verbose("Cluster locking selected.");
-               if (!init_cluster_locking(&_locking, cmd))
+               if (!init_cluster_locking(&_locking, cmd)) {
+                       log_error("Internal cluster locking initialisation failed.");
                        break;
+               }
                return 1;
 #endif
 
@@ -285,6 +291,8 @@ int init_locking(int type, struct cmd_context *cmd)
                          "be inaccessible.");
                if (init_file_locking(&_locking, cmd))
                        return 1;
+               else
+                       log_error("File-based locking initialisation failed.");
        }
 
        if (!ignorelockingfailure())

diff --git a/lib/locking/no_locking.c b/lib/locking/no_locking.c
index 85374b333947c1fec6421a908559df4cde144055..9de143b3783f8390e51def93b9fb8cc627ec197c 100644 (file)
--- a/lib/locking/no_locking.c
+++ b/lib/locking/no_locking.c
@@ -72,7 +72,7 @@ static int _readonly_lock_resource(struct cmd_context *cmd,
            (flags & LCK_SCOPE_MASK) == LCK_VG &&
            !(flags & LCK_CACHE) &&
            strcmp(resource, VG_GLOBAL)) {
-               log_error("Write locks are prohibited with --ignorelockingfailure.");
+               log_error("Write locks are prohibited with read-only locking.");
                return 0;
        }
 

diff --git a/liblvm/lvm_base.c b/liblvm/lvm_base.c
index b4be9061497c59e0e4c023c0f84def1f9c592994..ac94692884e8abd066b58df7723b35025bf1244e 100644 (file)
--- a/liblvm/lvm_base.c
+++ b/liblvm/lvm_base.c
@@ -51,7 +51,6 @@ lvm_t lvm_init(const char *system_dir)
        /* initialize locking */
        if (!init_locking(-1, cmd)) {
                /* FIXME: use EAGAIN as error code here */
-               log_error("Locking initialisation failed.");
                lvm_quit((lvm_t) cmd);
                return NULL;
        }

diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index e4b56da00a1bbf6de3fc6f979938afd2b3757cac..ad1513d1cb98ad88a2a712371aee4fcb6bcd4ff0 100644 (file)
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1027,8 +1027,6 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
                locking_type = -1;
 
        if (!init_locking(locking_type, cmd)) {
-               log_error("Locking type %d initialisation failed.",
-                         locking_type);
                ret = ECMD_FAILED;
                goto out;
        }