[Cluster-devel] conga ./clustermon.spec.in.in ./ricci.spec.in. ...

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

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2008-03-14 21:15:45

Modified files:
	.              : clustermon.spec.in.in ricci.spec.in.in 
	luci/site/luci/Extensions: LuciClusterActions.py 
	                           ricci_communicator.py 
	ricci/modules/cluster/clumon/src/common: Cluster.cpp 
	ricci/modules/cluster/clumon/src/daemon: Monitor.cpp 
	ricci/modules/storage: ContentFS.cpp ExtendedFS.cpp Mapper.cpp 
	                       MountHandler.cpp PTSource.cpp PV.cpp 
	                       Partition.cpp PartitionTable.cpp 
	                       parted_wrapper.cpp 

Log message:
	More gcc 3.4.0 build fixes

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.37&r2=1.38
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci.spec.in.in.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterActions.py.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_communicator.py.diff?cvsroot=cluster&r1=1.32&r2=1.33
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/common/Cluster.cpp.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/ContentFS.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/ExtendedFS.cpp.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/Mapper.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/MountHandler.cpp.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/PTSource.cpp.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/PV.cpp.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/Partition.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/PartitionTable.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/parted_wrapper.cpp.diff?cvsroot=cluster&r1=1.13&r2=1.14

--- conga/clustermon.spec.in.in	2008/02/20 17:23:54	1.37
+++ conga/clustermon.spec.in.in	2008/03/14 21:15:44	1.38
@@ -64,7 +64,7 @@
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - remote management
 
-Requires: oddjob dbus openssl
+Requires: cman oddjob dbus openssl libxml2
 Requires: initscripts util-linux
 Requires(post): chkconfig initscripts util-linux
 Requires(preun): chkconfig initscripts
--- conga/ricci.spec.in.in	2008/03/14 20:21:16	1.4
+++ conga/ricci.spec.in.in	2008/03/14 21:15:44	1.5
@@ -21,13 +21,13 @@
 
 BuildRequires: python-devel >= 2.4.1
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-BuildRequires: cman-devel
+BuildRequires: cman-devel libcap-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
-BuildRequires: openssl-devel dbus-devel pkgconfig file-devel
+BuildRequires: openssl-devel dbus-devel pkgconfig file-devel libvirt-devel
 
 Requires: initscripts
 Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
-Requires: sed util-linux
+Requires: sed util-linux libvirt file libxml2 libcap
 Requires: modcluster >= 0.10.0
 # modstorage
 Requires: parted util-linux
--- conga/luci/site/luci/Extensions/LuciClusterActions.py	2008/03/05 23:08:58	1.10
+++ conga/luci/site/luci/Extensions/LuciClusterActions.py	2008/03/14 21:15:44	1.11
@@ -338,7 +338,7 @@
 
 	# We need to get a node name other than the node
 	# to be deleted, then delete the node from the cluster.conf
-	# and propogate it. We will need two ricci agents for this task,
+	# and propagate it. We will need two ricci agents for this task,
 	# unless we are deleting the cluster itself.
 
 	if delete_cluster is False:
@@ -368,7 +368,7 @@
 
 	# Unless we're deleting the whole cluster, it is not worth
 	# flagging this node in DB, as we are going to delete it
-	# anyway. Now, we need to delete node from model and send out
+	# anyway. Now, we need to the delete node from model and send out
 	# new cluster.conf
 
 	if delete_cluster is True:
@@ -449,7 +449,7 @@
 		nodename_resolved = resolve_nodename(self, clustername, nodename)
 
 		try:
-			# XXX - do this in parallel
+			# XXX - do this in parallel on all nodes
 			rc = RicciCommunicator(nodename_resolved)
 		except Exception, e:
 			if LUCI_DEBUG_MODE is True:
@@ -481,7 +481,7 @@
 		nodename_resolved = resolve_nodename(self, clustername, nodename)
 
 		try:
-			# XXX - do this in parallel
+			# XXX - do this in parallel on all nodes
 			rc = RicciCommunicator(nodename_resolved)
 		except Exception, e:
 			if LUCI_DEBUG_MODE is True:
--- conga/luci/site/luci/Extensions/ricci_communicator.py	2008/01/02 21:00:32	1.32
+++ conga/luci/site/luci/Extensions/ricci_communicator.py	2008/03/14 21:15:45	1.33
@@ -169,7 +169,7 @@
 				luci_log.debug_net('RC:UNAUTH0: unauthenticate %s for %s:%d' \
 					% (ret, self.__hostname, self.__port))
 			if ret != '0':
-				raise Exception, 'Invalid response'
+				raise Exception, 'Invalid response: %s' % ret
 
 			try:
 				self.ss.untrust()
@@ -494,7 +494,7 @@
 					% batch_xml.toxml())
 			except:
 				pass
-		raise RicciError, 'Not an XML batch node'
+		raise RicciError, 'Not an XML batch node: %s' % batch_xml.nodeName
 
 	total = 0
 	last = 0
@@ -544,7 +544,7 @@
 		if LUCI_DEBUG_NET is True:
 			luci_log.debug_net_priv('RC:EMS0: Expecting "batch" got "%s"' \
 				% batch_xml.toxml())
-		raise RicciError, 'Invalid XML node; expecting a batch node'
+		raise RicciError, 'Invalid XML node; expecting a batch node: %s' % batch_xml.nodeName
 
 	c = 0
 	for node in batch_xml.childNodes:
--- conga/ricci/modules/cluster/clumon/src/common/Cluster.cpp	2008/01/02 20:47:36	1.10
+++ conga/ricci/modules/cluster/clumon/src/common/Cluster.cpp	2008/03/14 21:15:45	1.11
@@ -25,7 +25,8 @@
 #include <stdio.h>
 
 extern "C" {
-#	include <libcman.h>
+	#include <limits.h>
+	#include <libcman.h>
 }
 
 using namespace std;
--- conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp	2008/01/02 20:47:36	1.22
+++ conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp	2008/03/14 21:15:45	1.23
@@ -845,7 +845,7 @@
 	if (ch != NULL) {
 		int ret;
 		cman_version_t cman_version;
-		char *clu_version = "";
+		String clu_version = "";
 
 	    ret = cman_get_version(ch, &cman_version);
 		if (ret >= 0) {
--- conga/ricci/modules/storage/ContentFS.cpp	2007/09/11 02:45:28	1.6
+++ conga/ricci/modules/storage/ContentFS.cpp	2008/03/14 21:15:45	1.7
@@ -28,6 +28,7 @@
 #include "BDFactory.h"
 #include "defines.h"
 #include "utils.h"
+#include <algorithm>
 
 
 using namespace std;
--- conga/ricci/modules/storage/ExtendedFS.cpp	2007/09/11 02:45:28	1.9
+++ conga/ricci/modules/storage/ExtendedFS.cpp	2008/03/14 21:15:45	1.10
@@ -27,8 +27,9 @@
 #include "UMountError.h"
 #include "FileMagic.h"
 
-
+#include <algorithm>
 #include <iostream>
+
 using namespace std;
 
 
--- conga/ricci/modules/storage/Mapper.cpp	2007/09/11 02:45:28	1.4
+++ conga/ricci/modules/storage/Mapper.cpp	2008/03/14 21:15:45	1.5
@@ -26,6 +26,7 @@
 #include "BDFactory.h"
 #include "MapperFactory.h"
 #include "MidAir.h"
+#include <algorithm>
 
 
 using namespace std;
--- conga/ricci/modules/storage/MountHandler.cpp	2008/01/02 20:47:37	1.9
+++ conga/ricci/modules/storage/MountHandler.cpp	2008/03/14 21:15:45	1.10
@@ -37,8 +37,9 @@
 #include <sys/file.h>
 #include <errno.h>
 
-
+#include <algorithm>
 #include <iostream>
+
 using namespace std;
 
 
--- conga/ricci/modules/storage/PTSource.cpp	2007/09/11 02:45:28	1.3
+++ conga/ricci/modules/storage/PTSource.cpp	2008/03/14 21:15:45	1.4
@@ -25,6 +25,7 @@
 #include "PartitionTable.h"
 #include "parted_wrapper.h"
 
+#include <algorithm>
 
 using namespace std;
 
--- conga/ricci/modules/storage/PV.cpp	2007/09/11 02:45:28	1.7
+++ conga/ricci/modules/storage/PV.cpp	2008/03/14 21:15:45	1.8
@@ -26,6 +26,7 @@
 #include "MapperFactory.h"
 #include "utils.h"
 #include "LVMClusterLockingError.h"
+#include <algorithm>
 
 
 using namespace std;
--- conga/ricci/modules/storage/Partition.cpp	2007/09/11 02:45:28	1.4
+++ conga/ricci/modules/storage/Partition.cpp	2008/03/14 21:15:45	1.5
@@ -30,6 +30,7 @@
 #include "ContentExtendedPartition.h"
 #include "PV.h"
 
+#include <algorithm>
 
 using namespace std;
 
--- conga/ricci/modules/storage/PartitionTable.cpp	2007/09/11 02:45:28	1.6
+++ conga/ricci/modules/storage/PartitionTable.cpp	2008/03/14 21:15:45	1.7
@@ -28,7 +28,7 @@
 #include "MapperFactory.h"
 #include "utils.h"
 
-
+#include <algorithm>
 #include <iostream>
 
 
--- conga/ricci/modules/storage/parted_wrapper.cpp	2008/01/30 17:58:05	1.13
+++ conga/ricci/modules/storage/parted_wrapper.cpp	2008/03/14 21:15:45	1.14
@@ -24,8 +24,9 @@
 #include "parted_wrapper.h"
 #include "utils.h"
 
-
+#include <algorithm>
 #include <iostream>
+
 using namespace std;