activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [4/5] activemq-artemis git commit: Fix failing colocated examples
Date Mon, 03 Aug 2015 12:24:47 GMT
Fix failing colocated examples


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/df075c42
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/df075c42
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/df075c42

Branch: refs/heads/master
Commit: df075c423fbecf57d78513465300dd6740196160
Parents: fe95e34
Author: jbertram <jbertram@apache.org>
Authored: Wed Jul 29 16:53:44 2015 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Aug 3 08:24:28 2015 -0400

----------------------------------------------------------------------
 .../jms/example/ColocatedFailoverScaleDownExample.java       | 3 ++-
 .../artemis/jms/example/ColocatedFailoverExample.java        | 1 +
 .../src/main/resources/activemq/server0/broker.xml           | 4 +++-
 .../src/main/resources/activemq/server1/broker.xml           | 8 ++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/df075c42/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
index 29f54c3..147f65b 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
+++ b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
@@ -97,7 +97,8 @@ public class ColocatedFailoverScaleDownExample
          // Step 7. Crash server #0, the live server, and wait a little while to make sure
          // it has really crashed
          ServerUtil.killServer(server0);
-         Thread.sleep(5000);
+         System.out.println("Waiting for scale-down to complete...");
+         Thread.sleep(10000);
 
          // Step 8. start the connection ready to receive messages
          connection1.start();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/df075c42/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
index ad62419..c5bb765 100644
--- a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
+++ b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
@@ -97,6 +97,7 @@ public class ColocatedFailoverExample
          // Step 7. Crash server #0, the live server, and wait a little while to make sure
          // it has really crashed
          ServerUtil.killServer(server0);
+         Thread.sleep(10000);
 
          // Step 8. start the connection ready to receive messages
          connection.start();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/df075c42/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
b/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
index b38d764..0a4103f 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
@@ -89,7 +89,9 @@ under the License.
                <master>
                   <failover-on-shutdown>true</failover-on-shutdown>
                </master>
-               <slave/>
+               <slave>
+                  <failover-on-shutdown>true</failover-on-shutdown>
+               </slave>
             </colocated>
          </shared-store>
       </ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/df075c42/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
b/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
index f0dd088..8083f27 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
@@ -86,8 +86,12 @@ under the License.
                <backup-request-retry-interval>2000</backup-request-retry-interval>
                <max-backups>1</max-backups>
                <request-backup>true</request-backup>
-               <master/>
-               <slave/>
+               <master>
+                  <failover-on-shutdown>true</failover-on-shutdown>
+               </master>
+               <slave>
+                  <failover-on-shutdown>true</failover-on-shutdown>
+               </slave>
             </colocated>
          </shared-store>
       </ha-policy>


Mime
View raw message