[Cluster-devel] conga/ricci/modules/storage LV.cpp

[Cluster-devel] conga/ricci/modules/storage LV.cpp

[rmccabe]

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());
 }
 
 

[Cluster-devel] conga/ricci/modules/storage LV.cpp

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-06-15 15:30:42

Modified files:
	ricci/modules/storage: LV.cpp 

Log message:
	Do not destroy content on clustered-LVs when removing them from one node, as they may be in use by other cluster nodes.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/LV.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.7.2.1&r2=1.7.2.2

--- conga/ricci/modules/storage/LV.cpp	2007/03/05 20:22:36	1.7.2.1
+++ conga/ricci/modules/storage/LV.cpp	2007/06/15 15:30:41	1.7.2.2
@@ -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());
 }