[Cluster-devel] conga/ricci/modules/cluster ClusterStatus.cpp

[kupcevic@sourceware.org <kupcevic@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	kupcevic at sourceware.org	2007-03-06 09:09:48

Modified files:
	ricci/modules/cluster: ClusterStatus.cpp 

Log message:
	Fixed bz225747 (Create/delete cluster - then access disk on node = Generic error on host: cluster tools: cman_tool errored)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.2&r2=1.15.2.3

--- conga/ricci/modules/cluster/ClusterStatus.cpp	2007/03/01 00:31:20	1.15.2.2
+++ conga/ricci/modules/cluster/ClusterStatus.cpp	2007/03/06 09:09:48	1.15.2.3
@@ -42,6 +42,7 @@
 #define LSMOD_PATH            "/sbin/lsmod"
 #define MODPROBE_PATH         "/sbin/modprobe"
 #define CHKCONFIG_PATH        "/sbin/chkconfig"
+#define LVMCONF_PATH          "/usr/sbin/lvmconf"
 
 #define CMAN_LEAVE_TIMEOUT    "120"  // seconds (string)
 #define CLUMON_SYNC_TIME      8      // seconds
@@ -346,6 +347,15 @@
   
   if (purge_conf) {
     ClusterConf::purge_conf();
+    
+    // disable LVM cluster locking
+    try {
+      String out, err;
+      int status;
+      vector<String> args;
+      args.push_back("--disable-cluster");
+      utils::execute(LVMCONF_PATH, args, out, err, status, false);
+    } catch ( ... ) {}
   }
 }