[hornetq-commits] JBoss hornetq SVN: r11207 - in branches/Branch_2_2_EAP/src/main/org/hornetq/core: server/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-08-14 12:24:54 -0400 (Sun, 14 Aug 2011)
New Revision: 11207

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
Fixing failback test

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java	2011-08-14 16:00:29 UTC (rev 11206)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java	2011-08-14 16:24:54 UTC (rev 11207)
@@ -112,7 +112,7 @@
          {
             // The cluster may get in loop without this..
             // Case one node is stll sending nodeDown while another member is sending nodeUp
-            log.debug("Node was considered down too fast, ignoring addMember on Topology");
+            log.warn("Node was considered down too fast, ignoring addMember on Topology", new Exception("trace"));
             return false;
          }
 

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-08-14 16:00:29 UTC (rev 11206)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-08-14 16:24:54 UTC (rev 11207)
@@ -354,11 +354,10 @@
 
             if(nodeManager.isBackupLive())
             {
+               Thread.sleep(configuration.getFailbackDelay());
                //looks like we've failed over at some point need to inform that we are the backup so when the current live
                // goes down they failover to us
                clusterManager.announceBackup();
-               //
-               Thread.sleep(configuration.getFailbackDelay());
             }
 
             nodeManager.startLiveNode();