diff options
| author | Alan Conway <aconway@apache.org> | 2012-03-27 16:26:50 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-03-27 16:26:50 +0000 |
| commit | 8bd5ef1a13cf23b893bb5c96c9fd25124bdfcbe5 (patch) | |
| tree | 6e85d5667a8aa523630b268d386a4b92ace45fbb | |
| parent | 012f33fd105fb0838898bb66a25823aaf07a9704 (diff) | |
| download | qpid-python-8bd5ef1a13cf23b893bb5c96c9fd25124bdfcbe5.tar.gz | |
QPID-3603: Minor updates to doc and example cluster configuration.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1305890 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/etc/cluster.conf-example.xml | 17 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/cluster_failover | 2 | ||||
| -rw-r--r-- | qpid/doc/book/src/Active-Passive-Cluster.xml | 3 |
3 files changed, 9 insertions, 13 deletions
diff --git a/qpid/cpp/etc/cluster.conf-example.xml b/qpid/cpp/etc/cluster.conf-example.xml index d1a0fad01d..cdaef5b5a1 100644 --- a/qpid/cpp/etc/cluster.conf-example.xml +++ b/qpid/cpp/etc/cluster.conf-example.xml @@ -4,21 +4,16 @@ 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. --> -<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. diff --git a/qpid/cpp/src/tests/cluster_failover b/qpid/cpp/src/tests/cluster_failover index c978ee910c..2a68d1ec79 100755 --- a/qpid/cpp/src/tests/cluster_failover +++ b/qpid/cpp/src/tests/cluster_failover @@ -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 diff --git a/qpid/doc/book/src/Active-Passive-Cluster.xml b/qpid/doc/book/src/Active-Passive-Cluster.xml index 266fd3551d..5ab515f235 100644 --- a/qpid/doc/book/src/Active-Passive-Cluster.xml +++ b/qpid/doc/book/src/Active-Passive-Cluster.xml @@ -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"/> |