[Cluster-devel] conga/ricci/modules/storage LV.cpp
rmccabe at sourceware.org
rmccabe at sourceware.org
Thu Jun 14 22:14:26 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Branch: EXPERIMENTAL
Changes by: rmccabe at sourceware.org 2007-06-14 22:14:26
Modified files:
ricci/modules/storage: LV.cpp
Log message:
Don't hose clustered filesystems that may be mounted on other nodes when attempting to remove a clustered LV.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/LV.cpp.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.8&r2=1.8.2.1
--- conga/ricci/modules/storage/LV.cpp 2007/03/05 20:45:17 1.8
+++ conga/ricci/modules/storage/LV.cpp 2007/06/14 22:14:25 1.8.2.1
@@ -246,12 +246,14 @@
LV::remove()
{
// if VG is marked as clustered, but cluster locking is not available, throw
- if (_props.get("clustered").get_bool() &&
- !LVM::clustered_enabled())
- throw LVMClusterLockingError();
-
- content->remove();
- LVM::lvremove(path());
+ bool lv_clustered = _props.get("clustered").get_bool();
+ if (lv_clustered && !LVM::clustered_enabled())
+ throw LVMClusterLockingError();
+
+ /* Don't hose volumes that may be mounted elsewhere */
+ if (!lv_clustered)
+ content->remove();
+ LVM::lvremove(path());
}
More information about the Cluster-devel
mailing list