From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 29 Nov 2006 18:26:55 -0000
Subject: [Cluster-devel] conga luci/site/luci/Extensions/StorageReport. ...
Message-ID: <20061129182655.10223.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2006-11-29 18:26:53

Modified files:
	luci/site/luci/Extensions: StorageReport.py 
	ricci/modules/storage: LVM.cpp 

Log message:
	fix for bz #217703
	
	Related: bz217703

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/StorageReport.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.20&r2=1.20.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/LVM.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.1&r2=1.7.2.2

--- conga/luci/site/luci/Extensions/StorageReport.py	2006/10/16 19:49:09	1.20
+++ conga/luci/site/luci/Extensions/StorageReport.py	2006/11/29 18:26:53	1.20.2.1
@@ -1409,7 +1409,7 @@
                 # clvmd error
                 error  = True
                 url   += '?' + STONAME + '=' + storagename + '&' + PAGETYPE + '=' + STORAGE
-                msg    = 'clvmd (clustered LVM daemon) is not running on ' + storagename + '. Start it and try again.'
+                msg    = 'either clvmd (clustered LVM daemon) is not running or is not cluster-enabled on ' + storagename
             elif code == 5:
                 # not quorate
                 error  = True
--- conga/ricci/modules/storage/LVM.cpp	2006/11/01 22:06:55	1.7.2.1
+++ conga/ricci/modules/storage/LVM.cpp	2006/11/29 18:26:53	1.7.2.2
@@ -644,7 +644,8 @@
 bool 
 LVM::clustered_available()
 {
-  return get_locking_type() == "2";
+  String locking_type = get_locking_type();
+  return (locking_type == "2" || locking_type == "3");
 }
 
 bool
@@ -713,7 +714,7 @@
 void 
 LVM::check_locking()
 {
-  if (get_locking_type() == "2") {
+  if (clustered_available()) {
     if (!cluster_quorate())
       throw ClusterNotQuorateError();