From b1b59f31cf7b4b8719e1cdc2ef6c0b6b6eb3843e Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 16 Apr 2012 19:20:15 +0000
Subject: QPID-3603: Minor improvements to HA tests, documentation and
 examples.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1326755 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/etc/cluster.conf-example.xml.in | 27 ++++++++++++---------------
 cpp/etc/qpidd.in                    |  7 ++++---
 2 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'cpp/etc')

diff --git a/cpp/etc/cluster.conf-example.xml.in b/cpp/etc/cluster.conf-example.xml.in
index eb70ebbb1e..14b961a363 100644
--- a/cpp/etc/cluster.conf-example.xml.in
+++ b/cpp/etc/cluster.conf-example.xml.in
@@ -2,36 +2,33 @@
 <!--
 This is an example of a cluster.conf file to run qpidd HA under rgmanager.
 This example assumes a 3 node cluster, with nodes named node1, node2 and node3.
+
+NOTE: fencing is not shown, it should be configured in a real cluster configuration.
 -->
 
 <cluster name="qpid-test" config_version="18">
-  <!-- The cluster has 3 nodes. Each has a unique nodid and one vote for quorum. -->
+  <!-- The cluster has 3 nodes. Each has a unique nodid and one vote
+       for quorum. -->
   <clusternodes>
-    <clusternode name="node1" nodeid="1">
-      <fence/>
-    </clusternode>
-    <clusternode name="node2" nodeid="2">
-      <fence/>
-    </clusternode>
-    <clusternode name="node3" nodeid="3">
-      <fence/>
-    </clusternode>
+    <clusternode name="node1.example.com" nodeid="1"/>
+    <clusternode name="node2.example.com" nodeid="2"/>
+    <clusternode name="node3.example.com" nodeid="3"/>
   </clusternodes>
   <!-- Resouce Manager configuration. -->
-  <rm log_level="7">		<!-- Verbose logging -->
+  <rm>
     <!--
 	There is a failoverdomain for each node containing just that node.
-	This lets us stipulate that the qpidd service should always run on all nodes.
+	This lets us stipulate that the qpidd service should always run on each node.
     -->
     <failoverdomains>
       <failoverdomain name="node1-domain" restricted="1">
-	<failoverdomainnode name="node1"/>
+	<failoverdomainnode name="node1.example.com"/>
       </failoverdomain>
       <failoverdomain name="node2-domain" restricted="1">
-	<failoverdomainnode name="node2"/>
+	<failoverdomainnode name="node2.example.com"/>
       </failoverdomain>
       <failoverdomain name="node3-domain" restricted="1">
-	<failoverdomainnode name="node3"/>
+	<failoverdomainnode name="node3.example.com"/>
       </failoverdomain>
     </failoverdomains>
 
diff --git a/cpp/etc/qpidd.in b/cpp/etc/qpidd.in
index 23c15283dc..2b43625b7d 100755
--- a/cpp/etc/qpidd.in
+++ b/cpp/etc/qpidd.in
@@ -39,13 +39,14 @@ prog=qpidd
 lockfile=/var/lock/subsys/$prog
 pidfile=/var/run/qpidd.pid
 
-# Source function library.
-. /etc/rc.d/init.d/functions
-
+# Source configuration
 if [ -f !!sysconfdir!!/sysconfig/$prog ] ; then
 	. !!sysconfdir!!/sysconfig/$prog
 fi
 
+# Source function library.
+. /etc/rc.d/init.d/functions
+
 RETVAL=0
 
 #ensure binary is present and executable
-- 
cgit v1.2.1