Author: aconway
Date: Tue Mar 27 16:26:50 2012
New Revision: 1305890
URL: http://svn.apache.org/viewvc?rev=1305890&view=rev
Log:
QPID-3603: Minor updates to doc and example cluster configuration.
Modified:
qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml
qpid/trunk/qpid/cpp/src/tests/cluster_failover
qpid/trunk/qpid/doc/book/src/Active-Passive-Cluster.xml
Modified: qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml?rev=1305890&r1=1305889&r2=1305890&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml (original)
+++ qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml Tue Mar 27 16:26:50 2012
@@ -4,21 +4,16 @@ This is an example of a cluster.conf fil
This example assumes a 3 node cluster, with nodes named node1, node2 and node3.
-->
-<cluster name="qpid-test" config_version="4">
+<cluster name="qpid-test" config_version="18">
<!-- 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" nodeid="1"/>
+ <clusternode name="node2" nodeid="2"/>
+ <clusternode name="node3" nodeid="3"/>
</clusternodes>
<!-- Resouce Manager configuration. -->
- <rm log_level="7"> <!-- Optional logging -->
+ <rm log_level="7" <!-- Verbose logging -->
+ central_processing="1"> <!-- TODO explain-->
<!--
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.
Modified: qpid/trunk/qpid/cpp/src/tests/cluster_failover
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster_failover?rev=1305890&r1=1305889&r2=1305890&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster_failover (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster_failover Tue Mar 27 16:26:50 2012
@@ -1,6 +1,6 @@
#!/bin/sh
# A simple manual failover test, sends a stream of numbered messages.
-# You can kill the connected broker and verify that the client reconnects
+# You can kill the connected broker and verify that the clients reconnect
# and no messages are lost.
URL=$1
Modified: qpid/trunk/qpid/doc/book/src/Active-Passive-Cluster.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Active-Passive-Cluster.xml?rev=1305890&r1=1305889&r2=1305890&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Active-Passive-Cluster.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Active-Passive-Cluster.xml Tue Mar 27 16:26:50
2012
@@ -462,7 +462,8 @@ under the License.
</clusternode>
</clusternodes>
<cman/>
- <rm>
+ <rm log_level="7" <!-- Verbose logging -->
+ central_processing="1"> <!-- TODO explain-->
<failoverdomains>
<failoverdomain name="mrg32-domain" restricted="1">
<failoverdomainnode name="mrg32"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
