Add memlock information to do_lock_lv debug output.

This helps a lot to detect that something strange happened.

diff --git a/WHATS_NEW b/WHATS_NEW
index c515472363fd839c57e9269e96df09d3b15883fc..e39a67c752e8e073ed4a2bf272ab8e75d30fe6ff 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.57 -
 ====================================
+  Add memlock information to do_lock_lv debug output.
   Never use distributed lock for LV in non-clustered VG.
   Allow implicit lock conversion in pre/post callbacks on local node.
   Allow implicit convert to the same cluster lock mode.

diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c
index dcc4104afc75342c2eff915eef93252a21b74791..d5571016553f1eaa8939788d6e308af604644994 100644 (file)
--- a/daemons/clvmd/lvm-functions.c
+++ b/daemons/clvmd/lvm-functions.c
@@ -477,8 +477,8 @@ int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
 {
        int status = 0;
 
-       DEBUGLOG("do_lock_lv: resource '%s', cmd = %s, flags = %s\n",
-                resource, decode_locking_cmd(command), decode_flags(lock_flags));
+       DEBUGLOG("do_lock_lv: resource '%s', cmd = %s, flags = %s, memlock = %d\n",
+                resource, decode_locking_cmd(command), decode_flags(lock_flags), memlock());
 
        if (!cmd->config_valid || config_files_changed(cmd)) {
                /* Reinitialise various settings inc. logging, filters */
@@ -541,7 +541,7 @@ int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
        dm_pool_empty(cmd->mem);
        pthread_mutex_unlock(&lvm_lock);
 
-       DEBUGLOG("Command return is %d\n", status);
+       DEBUGLOG("Command return is %d, memlock is %d\n", status, memlock());
        return status;
 }