vgchange: improve some lvmlockd lockstart messages

Stop printing "Skipping global lock: lockspace not found or started"
for vgchange --lockstart, since it's generally an inherent limitation
that the global lock isn't available until after locking is started.

Update the start delay warning to "a few seconds".

diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c
index 2443c979455f10bceeeb879b1f113f2d30ee9fe6..e8db30eaf59783fc223f46c358218a5826c04a6b 100644 (file)
--- a/lib/locking/lvmlockd.c
+++ b/lib/locking/lvmlockd.c
@@ -1958,7 +1958,7 @@ int lockd_global(struct cmd_context *cmd, const char *def_mode)
                }
 
                if ((lockd_flags & LD_RF_NO_GL_LS) || (lockd_flags & LD_RF_NO_LOCKSPACES)) {
-                       log_warn("Skipping global lock: lockspace not found or started");
+                       log_debug("Skipping global lock: lockspace not found or started");
                        goto allow;
                }
 

diff --git a/tools/vgchange.c b/tools/vgchange.c
index a44b865b7867874eabf221652caa00e1cd949c1a..137b1dc01387c228bd97eecc05ce33508ddab9b8 100644 (file)
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -1487,7 +1487,7 @@ int vgchange_lock_start_stop_cmd(struct cmd_context *cmd, int argc, char **argv)
 
                if (!start_opt || !strcmp(start_opt, "auto")) {
                        if (vp.lock_start_sanlock)
-                               log_print_unless_silent("Starting locking.  Waiting for sanlock may take 20 sec to 3 min...");
+                               log_print_unless_silent("Starting locking.  Waiting for sanlock may take a few seconds to 3 min...");
                        else
                                log_print_unless_silent("Starting locking.  Waiting until locks are ready...");
                        lockd_start_wait(cmd);