From 27132718d42f73e84d24e6ac6e76c22659bb7333 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 9 Dec 2009 19:01:27 +0000 Subject: [PATCH] Add memlock information to do_lock_lv debug output. This helps a lot to detect that something strange happened. --- WHATS_NEW | 1 + daemons/clvmd/lvm-functions.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index c51547236..e39a67c75 100644 --- 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 dcc4104af..d55710165 100644 --- 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; } -- 2.43.5