diff options
| author | Alan Conway <aconway@apache.org> | 2012-04-05 19:31:21 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-04-05 19:31:21 +0000 |
| commit | 6ca0f3ab3be2f37fc5819e33c21db644497a29ba (patch) | |
| tree | 29694663102e0e59a1669488db146c8d3b5c888a /cpp/src | |
| parent | 776dfe05fc99803790e07ed1d0487a0b47888ed6 (diff) | |
| download | qpid-python-6ca0f3ab3be2f37fc5819e33c21db644497a29ba.tar.gz | |
QPID-3603: Update HA documentatiion
Also renamed --ha-replicate-default to --ha-replicate
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1310026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/ha/HaPlugin.cpp | 2 | ||||
| -rwxr-xr-x | cpp/src/tests/ha_tests.py | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/qpid/ha/HaPlugin.cpp b/cpp/src/qpid/ha/HaPlugin.cpp index 419ee962da..4da3b0d7d2 100644 --- a/cpp/src/qpid/ha/HaPlugin.cpp +++ b/cpp/src/qpid/ha/HaPlugin.cpp @@ -37,7 +37,7 @@ struct Options : public qpid::Options { "URL that backup brokers use to connect and fail over.") ("ha-public-brokers", optValue(settings.clientUrl,"URL"), "URL that clients use to connect and fail over, defaults to ha-brokers.") - ("ha-replicate-default", + ("ha-replicate", optValue(settings.replicateDefault, "LEVEL"), "Replication level for creating queues and exchanges if there is no qpid.replicate argument supplied. LEVEL is 'none', 'configuration' or 'all'") ("ha-expected-backups", optValue(settings.expectedBackups, "N"), diff --git a/cpp/src/tests/ha_tests.py b/cpp/src/tests/ha_tests.py index 10d5fc0db2..a9771350aa 100755 --- a/cpp/src/tests/ha_tests.py +++ b/cpp/src/tests/ha_tests.py @@ -30,7 +30,7 @@ log = getLogger("qpid.ha-tests") class HaBroker(Broker): def __init__(self, test, args=[], broker_url=None, ha_cluster=True, - ha_replicate_default="all", **kwargs): + ha_replicate="all", **kwargs): assert BrokerTest.ha_lib, "Cannot locate HA plug-in" args = copy(args) args += ["--load-module", BrokerTest.ha_lib, @@ -38,8 +38,8 @@ class HaBroker(Broker): # FIXME aconway 2012-02-13: workaround slow link failover. "--link-maintenace-interval=0.1", "--ha-cluster=%s"%ha_cluster] - if ha_replicate_default is not None: - args += [ "--ha-replicate-default=%s"%ha_replicate_default ] + if ha_replicate is not None: + args += [ "--ha-replicate=%s"%ha_replicate ] if broker_url: args.extend([ "--ha-brokers", broker_url ]) Broker.__init__(self, test, args, **kwargs) self.commands=os.getenv("PYTHON_COMMANDS") @@ -533,10 +533,10 @@ class ReplicationTests(HaTest): for t in tests: t.verify(self, backup2) def test_replicate_default(self): - """Make sure we don't replicate if ha-replicate-default is unspecified or none""" - cluster1 = HaCluster(self, 2, ha_replicate_default=None) + """Make sure we don't replicate if ha-replicate is unspecified or none""" + cluster1 = HaCluster(self, 2, ha_replicate=None) c1 = cluster1[0].connect().session().sender("q;{create:always}") - cluster2 = HaCluster(self, 2, ha_replicate_default="none") + cluster2 = HaCluster(self, 2, ha_replicate="none") cluster2[0].connect().session().sender("q;{create:always}") time.sleep(.1) # Give replication a chance. try: @@ -550,7 +550,7 @@ class ReplicationTests(HaTest): def test_invalid_default(self): """Verify that a queue with an invalid qpid.replicate gets default treatment""" - cluster = HaCluster(self, 2, ha_replicate_default="all") + cluster = HaCluster(self, 2, ha_replicate="all") c = cluster[0].connect().session().sender("q;{create:always, node:{x-declare:{arguments:{'qpid.replicate':XXinvalidXX}}}}") self.wait_backup(cluster[1], "q") |