summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/IceStorm/replicated/Publisher.cpp6
-rw-r--r--cpp/demo/IceStorm/replicated/README4
-rw-r--r--cpp/demo/IceStorm/replicated/application.xml1
-rw-r--r--cpp/demo/IceStorm/replicated/config.pub2
4 files changed, 4 insertions, 9 deletions
diff --git a/cpp/demo/IceStorm/replicated/Publisher.cpp b/cpp/demo/IceStorm/replicated/Publisher.cpp
index 76c35250c1c..7be94ee3f41 100644
--- a/cpp/demo/IceStorm/replicated/Publisher.cpp
+++ b/cpp/demo/IceStorm/replicated/Publisher.cpp
@@ -63,11 +63,9 @@ Publisher::run(int argc, char* argv[])
//
// Get the topic's publisher object, and configure a Clock proxy
- // with per-request load balancing with round robin from the
- // IceGrid locator for the publisher object.
+ // with per-request load balancing.
//
- ClockPrx clock = ClockPrx::uncheckedCast(
- topic->getPublisher()->ice_oneway()->ice_locatorCacheTimeout(0)->ice_connectionCached(false));
+ ClockPrx clock = ClockPrx::uncheckedCast(topic->getPublisher()->ice_oneway()->ice_connectionCached(false));
try
{
diff --git a/cpp/demo/IceStorm/replicated/README b/cpp/demo/IceStorm/replicated/README
index d9031138ddf..3acc8eaa264 100644
--- a/cpp/demo/IceStorm/replicated/README
+++ b/cpp/demo/IceStorm/replicated/README
@@ -31,9 +31,7 @@ to the `time' topic of each IceStorm service instance.
The publisher just retrieves the publisher proxy of the `time' topic
from a randomly selected IceStorm service instance. This publisher
proxy is configured to use per-request load balancing so that each
-invocation is sent successively to each replica thanks to the round
-robin load balancing configured for the replica group (you can set
-Ice.Trace.Location=1 to see the locator invocations).
+invocation is sent to a random replica.
Note that the subscriptions are not persistent and the subscriber
makes no attempt to re-establish dropped subscriptions. So if an
diff --git a/cpp/demo/IceStorm/replicated/application.xml b/cpp/demo/IceStorm/replicated/application.xml
index d065313cdf3..73cb00976e9 100644
--- a/cpp/demo/IceStorm/replicated/application.xml
+++ b/cpp/demo/IceStorm/replicated/application.xml
@@ -34,7 +34,6 @@
</server-template>
<replica-group id="IceStormPublishReplicaGroup">
- <load-balancing type="round-robin"/>
</replica-group>
<replica-group id="IceStormTopicManagerReplicaGroup">
diff --git a/cpp/demo/IceStorm/replicated/config.pub b/cpp/demo/IceStorm/replicated/config.pub
index f5704535d54..b30173d4583 100644
--- a/cpp/demo/IceStorm/replicated/config.pub
+++ b/cpp/demo/IceStorm/replicated/config.pub
@@ -6,7 +6,7 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
#
# Location Tracing
#
-Ice.Trace.Location=1
+#Ice.Trace.Location=1
#
# Network Tracing