From 311d319e0a47e4cbe3c35d88fbcd8c09322c326c Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 10 Aug 2011 16:07:53 +0000 Subject: [PATCH] If anything bad happens and unlocking fails (here clvmd crashed in the middle of operation), lock is not removed from cache - here is one example: locking/cluster_locking.c:497 Locking VG V_vg_test UN (VG) (0x6) locking/cluster_locking.c:113 Error writing data to clvmd: Broken pipe locking/locking.c:399 locking/locking.c:461 Internal error: Volume Group vg_test was not unlocked Code should always remove lock info from lvmcache and update counters on unlock, even if unlock fails. --- WHATS_NEW | 1 + lib/locking/locking.c | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 466615a1d..043b19b49 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.87 - =============================== + Remove lock from cache even if unlock fails. Initialise clvmd locks before lvm context to avoid open descriptor leaks. Remove obsoleted GULM clvmd cluster locking support. Suppress low-level locking errors and warnings while using --sysinit. diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 8d709f685..79a6d563d 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -359,6 +359,8 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname) static int _lock_vol(struct cmd_context *cmd, const char *resource, uint32_t flags, lv_operation_t lv_op) { + uint32_t lck_type = flags & LCK_TYPE_MASK; + uint32_t lck_scope = flags & LCK_SCOPE_MASK; int ret = 0; _block_signals(flags); @@ -376,21 +378,16 @@ static int _lock_vol(struct cmd_context *cmd, const char *resource, return 0; } - if (cmd->metadata_read_only && - ((flags & LCK_TYPE_MASK) == LCK_WRITE) && + if (cmd->metadata_read_only && lck_type == LCK_WRITE && strcmp(resource, VG_GLOBAL)) { log_error("Operation prohibited while global/metadata_read_only is set."); return 0; } if ((ret = _locking.lock_resource(cmd, resource, flags))) { - if ((flags & LCK_SCOPE_MASK) == LCK_VG && - !(flags & LCK_CACHE)) { - if ((flags & LCK_TYPE_MASK) == LCK_UNLOCK) - lvmcache_unlock_vgname(resource); - else - lvmcache_lock_vgname(resource, (flags & LCK_TYPE_MASK) - == LCK_READ); + if (lck_scope == LCK_VG && !(flags & LCK_CACHE)) { + if (lck_type != LCK_UNLOCK) + lvmcache_lock_vgname(resource, lck_type == LCK_READ); dev_reset_error_count(cmd); } @@ -398,6 +395,13 @@ static int _lock_vol(struct cmd_context *cmd, const char *resource, } else stack; + /* If unlocking, always remove lock from lvmcache even if operation failed. */ + if (lck_scope == LCK_VG && !(flags & LCK_CACHE) && lck_type == LCK_UNLOCK) { + lvmcache_unlock_vgname(resource); + if (!ret) + _update_vg_lock_count(resource, flags); + } + _unlock_memory(cmd, lv_op); _unblock_signals(); -- 2.43.5