shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-31 14:50:37 +03:00
Code Releases Activity

Allow implicit lock conversion for pre/post callbacks.

Browse Source 
This is unnoticed regression from commit 31672ff60e405795cad70d6d7888ac011f5373ce

The pre/post callback need to convert lock always, local node
is going to modify metadata in this case, it it fails conversion,
the call is ignored.

Also it fixes bug when the lock is not yet held, we cannot set LKF_CONVERT
in this case, it will fail because this lock do not exist.

Note that the automatic conversion is still disabled in activate
call, so the original fix (reactivation of exlusive LV) should
be still in place.
This commit is contained in:
Milan Broz 2009-12-09 18:55:53 +00:00
parent b5bad15dae
commit 97d28ae4d7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.57 -
====================================
Allow implicit lock conversion in pre/post callbacks on local node.
Allow implicit convert to the same cluster lock mode.
Replace magic masks in cluster locking code by defined masks.
Remove log volume from metadata if initial deactivation fails.

13
daemons/clvmd/lvm-functions.c
View File

@ -274,7 +274,7 @@ int hold_lock(char *resource, int mode, int flags)
return -1;
lvi->lock_mode = mode;
status = sync_lock(resource, mode, flags, &lvi->lock_id);
status = sync_lock(resource, mode, flags & ~LKF_CONVERT, &lvi->lock_id);
saved_errno = errno;
if (status) {
free(lvi);
@ -348,7 +348,11 @@ static int do_activate_lv(char *resource, unsigned char lock_flags, int mode)
mode = LKM_EXMODE;
}
/* Try to get the lock if it's a clustered volume group */
/*
* Try to get the lock if it's a clustered volume group.
* Use lock conversion only if requested, to prevent implicit conversion
* of exclusive lock to shared one during activation.
*/
if (lock_flags & LCK_CLUSTER_VG) {
status = hold_lock(resource, mode, LKF_NOQUEUE | (lock_flags & LCK_CONVERT?LKF_CONVERT:0));
if (status) {
@ -546,12 +550,13 @@ int pre_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
/* Nearly all the stuff happens cluster-wide. Apart from SUSPEND. Here we get the
lock out on this node (because we are the node modifying the metadata)
before suspending cluster-wide.
LKF_CONVERT is used always, local node is going to modify metadata
*/
if ((command & (LCK_SCOPE_MASK | LCK_TYPE_MASK)) == LCK_LV_SUSPEND) {
DEBUGLOG("pre_lock_lv: resource '%s', cmd = %s, flags = %s\n",
resource, decode_locking_cmd(command), decode_flags(lock_flags));
if (hold_lock(resource, LKM_PWMODE, LKF_NOQUEUE| (lock_flags & LCK_CONVERT?LKF_CONVERT:0)))
if (hold_lock(resource, LKM_PWMODE, LKF_NOQUEUE | LKF_CONVERT))
return errno;
}
return 0;
@ -583,7 +588,7 @@ int post_lock_lv(unsigned char command, unsigned char lock_flags,
return EIO;
if (lvi.exists) {
if (hold_lock(resource, LKM_CRMODE, lock_flags & LCK_CONVERT?LKF_CONVERT:0))
if (hold_lock(resource, LKM_CRMODE, LKF_CONVERT))
return errno;
} else {
if (hold_unlock(resource))