JBoss hornetq SVN: r10956 - in branches/HORNETQ-720_Replication: hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl and 2 other directories.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-07-07 11:54:23 -0400 (Thu, 07 Jul 2011)
New Revision: 10956
Modified:
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
Log:
cluster manager announces replicated backup fix
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java 2011-07-07 14:51:04 UTC (rev 10955)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java 2011-07-07 15:54:23 UTC (rev 10956)
@@ -22,6 +22,7 @@
import org.hornetq.api.core.client.ClusterTopologyListener;
import org.hornetq.core.client.impl.Topology;
import org.hornetq.core.config.BridgeConfiguration;
+import org.hornetq.core.protocol.core.Channel;
import org.hornetq.core.server.HornetQComponent;
/**
@@ -56,7 +57,10 @@
void announceBackup() throws Exception;
+ void announceReplicatingBackup(Channel liveChannel);
+
void deployBridge(BridgeConfiguration config) throws Exception;
void destroyBridge(String name) throws Exception;
+
}
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-07-07 14:51:04 UTC (rev 10955)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-07-07 15:54:23 UTC (rev 10956)
@@ -44,6 +44,8 @@
import org.hornetq.core.logging.Logger;
import org.hornetq.core.postoffice.Binding;
import org.hornetq.core.postoffice.PostOffice;
+import org.hornetq.core.protocol.core.Channel;
+import org.hornetq.core.protocol.core.impl.wireformat.HaBackupRegistrationMessage;
import org.hornetq.core.protocol.core.impl.wireformat.NodeAnnounceMessage;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
@@ -462,6 +464,30 @@
}
}
+ @Override
+ public void announceReplicatingBackup(Channel liveChannel)
+ {
+ List<ClusterConnectionConfiguration> configs = this.configuration.getClusterConfigurations();
+ if(!configs.isEmpty())
+ {
+ ClusterConnectionConfiguration config = configs.get(0);
+
+ TransportConfiguration connector = configuration.getConnectorConfigurations().get(config.getConnectorName());
+
+ if (connector == null)
+ {
+ log.warn("No connector with name '" + config.getConnectorName() +
+ "'. backup cannot be announced.");
+ return;
+ }
+ liveChannel.send(new HaBackupRegistrationMessage(nodeUUID.toString(), connector));
+ }
+ else
+ {
+ log.warn("no cluster connections defined, unable to announce backup");
+ }
+ }
+
private synchronized void announceNode()
{
// TODO does this really work with more than one cluster connection? I think not
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 14:51:04 UTC (rev 10955)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 15:54:23 UTC (rev 10956)
@@ -337,7 +337,14 @@
public void close(boolean permanently) throws Exception
{
-
+ if(permanently)
+ {
+ nodeManager.crashLiveServer();
+ }
+ else
+ {
+ nodeManager.pauseLiveServer();
+ }
}
}
@@ -558,7 +565,7 @@
connectToReplicationEndpoint(replicationChannel);
replicationEndpoint.start();
- liveChannel.send(new HaBackupRegistrationMessage(getNodeID().toString(), config));
+ clusterManager.announceReplicatingBackup(liveChannel);
log.info("HornetQ Backup Server version " + getVersion().getFullVersion() + " [" + nodeManager.getNodeId() +
"] started, waiting live to fail before it gets active");
Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-07-07 14:51:04 UTC (rev 10955)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-07-07 15:54:23 UTC (rev 10956)
@@ -206,8 +206,8 @@
liveServer = createLiveServer();
liveServer.getServer().setIdentity("idLive");
- liveServer.start();
- backupServer.start();
+ //liveServer.start();
+ //backupServer.start();
}
@Override
13 years, 6 months
JBoss hornetq SVN: r10955 - branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-07-07 10:51:04 -0400 (Thu, 07 Jul 2011)
New Revision: 10955
Modified:
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
backup was being announced twice
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 14:46:34 UTC (rev 10954)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 14:51:04 UTC (rev 10955)
@@ -557,7 +557,6 @@
replicationChannel.setHandler(replicationEndpoint);
connectToReplicationEndpoint(replicationChannel);
replicationEndpoint.start();
- clusterManager.announceBackup();
liveChannel.send(new HaBackupRegistrationMessage(getNodeID().toString(), config));
13 years, 6 months
JBoss hornetq SVN: r10954 - branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-07-07 10:46:34 -0400 (Thu, 07 Jul 2011)
New Revision: 10954
Modified:
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
Log:
HORNETQ-720 Connector for backup at the cluster must be the backup connector
(and not the live)
Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-07-07 14:40:54 UTC (rev 10953)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-07-07 14:46:34 UTC (rev 10954)
@@ -181,8 +181,8 @@
backupConfig.getConnectorConfigurations().put(backupConnector.getName(), backupConnector);
backupConfig.getConnectorConfigurations().put(LIVE_NODE_NAME, liveConnector);
- backupConfig.getClusterConfigurations()
- .add(createClusterConnectionConf(backupConnector.getName(), LIVE_NODE_NAME));
+ backupConfig.getClusterConfigurations().add(createClusterConnectionConf(backupConnector.getName(),
+ backupConnector.getName()));
backupConfig.setSecurityEnabled(false);
backupConfig.setSharedStore(false);
13 years, 6 months
JBoss hornetq SVN: r10953 - in branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster: util and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-07-07 10:40:54 -0400 (Thu, 07 Jul 2011)
New Revision: 10953
Modified:
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java
Log:
HORNETQ-720 Make sure live has a proper cluster configuration
Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-07-07 14:40:17 UTC (rev 10952)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-07-07 14:40:54 UTC (rev 10953)
@@ -60,7 +60,7 @@
// Constants -----------------------------------------------------
protected static final SimpleString ADDRESS = new SimpleString("FailoverTestAddress");
- protected static final String LIVE_NODE_NAME = "hqLIVE";
+ private static final String LIVE_NODE_NAME = "hqLIVE";
// Attributes ----------------------------------------------------
@@ -166,6 +166,9 @@
protected void createReplicatedConfigs() throws Exception
{
+ final TransportConfiguration liveConnector = getConnectorTransportConfiguration(true);
+ final TransportConfiguration backupConnector = getConnectorTransportConfiguration(false);
+
nodeManager = new InVMNodeManager();
backupConfig = super.createDefaultConfig();
@@ -175,14 +178,11 @@
backupConfig.setLargeMessagesDirectory(backupConfig.getLargeMessagesDirectory() + "_backup");
backupConfig.getAcceptorConfigurations().clear();
backupConfig.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(false));
- TransportConfiguration liveConnector = getConnectorTransportConfiguration(true);
- TransportConfiguration backupConnector = getConnectorTransportConfiguration(false);
- // probably not necessary...
+
backupConfig.getConnectorConfigurations().put(backupConnector.getName(), backupConnector);
backupConfig.getConnectorConfigurations().put(LIVE_NODE_NAME, liveConnector);
backupConfig.getClusterConfigurations()
.add(createClusterConnectionConf(backupConnector.getName(), LIVE_NODE_NAME));
- backupConfig.getConnectorConfigurations().put(LIVE_NODE_NAME, getConnectorTransportConfiguration(true));
backupConfig.setSecurityEnabled(false);
backupConfig.setSharedStore(false);
@@ -191,18 +191,20 @@
backupConfig.setClustered(true);
backupServer = createBackupServer();
- backupServer.getServer().setIdentity("id_backup");
+ backupServer.getServer().setIdentity("idBackup");
liveConfig = super.createDefaultConfig();
liveConfig.getAcceptorConfigurations().clear();
liveConfig.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true));
+
liveConfig.setName(LIVE_NODE_NAME);
+ liveConfig.getConnectorConfigurations().put(LIVE_NODE_NAME, liveConnector);
liveConfig.setSecurityEnabled(false);
liveConfig.setSharedStore(false);
liveConfig.setClustered(true);
- liveConfig.getClusterConfigurations().add(createClusterConnectionConf(liveConnector.getName()));
+ liveConfig.getClusterConfigurations().add(createClusterConnectionConf(LIVE_NODE_NAME, LIVE_NODE_NAME));
liveServer = createLiveServer();
- liveServer.getServer().setIdentity("id_live");
+ liveServer.getServer().setIdentity("idLive");
liveServer.start();
backupServer.start();
Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java 2011-07-07 14:40:17 UTC (rev 10952)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java 2011-07-07 14:40:54 UTC (rev 10953)
@@ -29,14 +29,12 @@
* A SameProcessHornetQServer
*
* @author jmesnil
- *
- *
*/
public class SameProcessHornetQServer implements TestableServer
{
-
- private HornetQServer server;
+ private final HornetQServer server;
+
public SameProcessHornetQServer(HornetQServer server)
{
this.server = server;
@@ -106,7 +104,7 @@
// Wait to be informed of failure
boolean ok = latch.await(10000, TimeUnit.MILLISECONDS);
- Assert.assertTrue(ok);
+ Assert.assertTrue("failed to stop the server", ok);
}
/* (non-Javadoc)
@@ -127,7 +125,7 @@
// Public --------------------------------------------------------
-
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
13 years, 6 months
JBoss hornetq SVN: r10952 - branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-07-07 10:40:17 -0400 (Thu, 07 Jul 2011)
New Revision: 10952
Modified:
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
Log:
Spelling fixes
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-07-07 14:39:41 UTC (rev 10951)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-07-07 14:40:17 UTC (rev 10952)
@@ -274,7 +274,7 @@
{
return;
}
-
+
for (ClusterTopologyListener listener : clientListeners)
{
listener.nodeUP(nodeID, member.getConnector(), last);
@@ -295,7 +295,7 @@
}
}
}
-
+
public boolean isStarted()
{
return started;
@@ -450,7 +450,7 @@
if (connector == null)
{
- log.warn("No connecor with name '" + config.getConnectorName() +
+ log.warn("No connector with name '" + config.getConnectorName() +
"'. backup cannot be announced.");
return;
}
@@ -749,7 +749,7 @@
if (connector == null)
{
- log.warn("No connecor with name '" + config.getConnectorName() +
+ log.warn("No connector with name '" + config.getConnectorName() +
"'. The cluster connection will not be deployed.");
return;
}
13 years, 6 months
JBoss hornetq SVN: r10951 - branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-07-07 10:39:41 -0400 (Thu, 07 Jul 2011)
New Revision: 10951
Modified:
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
HORNETQ-720 Announce backup through clustermanager
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 13:53:21 UTC (rev 10950)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 14:39:41 UTC (rev 10951)
@@ -557,6 +557,7 @@
replicationChannel.setHandler(replicationEndpoint);
connectToReplicationEndpoint(replicationChannel);
replicationEndpoint.start();
+ clusterManager.announceBackup();
liveChannel.send(new HaBackupRegistrationMessage(getNodeID().toString(), config));
13 years, 6 months
JBoss hornetq SVN: r10950 - branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-07-07 09:53:21 -0400 (Thu, 07 Jul 2011)
New Revision: 10950
Modified:
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
HORNETQ-720 Set started to true earlier
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 13:11:39 UTC (rev 10949)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 13:53:21 UTC (rev 10950)
@@ -530,8 +530,8 @@
clusterManager.start();
// XXX this really belongs to this point?
initialisePart2();
+ started = true;
-
String liveConnectorName = configuration.getLiveConnectorName();
if (liveConnectorName == null)
{
@@ -560,8 +560,6 @@
liveChannel.send(new HaBackupRegistrationMessage(getNodeID().toString(), config));
- started = true;
-
log.info("HornetQ Backup Server version " + getVersion().getFullVersion() + " [" + nodeManager.getNodeId() +
"] started, waiting live to fail before it gets active");
nodeManager.awaitLiveNode();
13 years, 6 months
JBoss hornetq SVN: r10949 - branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-07-07 09:11:39 -0400 (Thu, 07 Jul 2011)
New Revision: 10949
Modified:
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
HORNETQ-720 Fix snafu: send HaBackupRegistration only once!
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 13:11:07 UTC (rev 10948)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 13:11:39 UTC (rev 10949)
@@ -552,8 +552,8 @@
}
CoreRemotingConnection liveConnection = liveServerSessionFactory.getConnection();
Channel liveChannel = liveConnection.getChannel(CHANNEL_ID.PING.id, -1);
- liveChannel.send(new HaBackupRegistrationMessage(getNodeID().toString(), config));
Channel replicationChannel = liveConnection.getChannel(CHANNEL_ID.REPLICATION.id, -1);
+
replicationChannel.setHandler(replicationEndpoint);
connectToReplicationEndpoint(replicationChannel);
replicationEndpoint.start();
13 years, 6 months
JBoss hornetq SVN: r10948 - branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-07-07 09:11:07 -0400 (Thu, 07 Jul 2011)
New Revision: 10948
Modified:
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java
Log:
avoid double negatives
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2011-07-07 10:49:27 UTC (rev 10947)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2011-07-07 13:11:07 UTC (rev 10948)
@@ -414,17 +414,15 @@
synchronized (replicationLock)
{
- if (!enabled)
+ if (enabled)
{
- // Already replicating channel failed, so just play the action now
-
- runItNow = true;
+ pendingTokens.add(repliToken);
+ replicatingChannel.send(packet);
}
else
{
- pendingTokens.add(repliToken);
-
- replicatingChannel.send(packet);
+ // Already replicating channel failed, so just play the action now
+ runItNow = true;
}
}
13 years, 6 months
JBoss hornetq SVN: r10947 - branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-07-07 06:49:27 -0400 (Thu, 07 Jul 2011)
New Revision: 10947
Modified:
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
HORNETQ-720 call connect to replicationEndpoint.
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 10:48:36 UTC (rev 10946)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-07 10:49:27 UTC (rev 10947)
@@ -527,8 +527,9 @@
nodeManager.startBackup();
initialisePart1();
-
clusterManager.start();
+ // XXX this really belongs to this point?
+ initialisePart2();
String liveConnectorName = configuration.getLiveConnectorName();
@@ -552,7 +553,9 @@
CoreRemotingConnection liveConnection = liveServerSessionFactory.getConnection();
Channel liveChannel = liveConnection.getChannel(CHANNEL_ID.PING.id, -1);
liveChannel.send(new HaBackupRegistrationMessage(getNodeID().toString(), config));
- liveConnection.getChannel(CHANNEL_ID.REPLICATION.id, -1).setHandler(replicationEndpoint);
+ Channel replicationChannel = liveConnection.getChannel(CHANNEL_ID.REPLICATION.id, -1);
+ replicationChannel.setHandler(replicationEndpoint);
+ connectToReplicationEndpoint(replicationChannel);
replicationEndpoint.start();
liveChannel.send(new HaBackupRegistrationMessage(getNodeID().toString(), config));
@@ -564,10 +567,6 @@
nodeManager.awaitLiveNode();
// Server node (i.e. Life node) is not running, now the backup takes over.
- // XXX this really belongs to this point?
- initialisePart2();
-
-
configuration.setBackup(false);
}
@@ -995,6 +994,10 @@
return session;
}
+ /**
+ * XXX FIXME to be made private, and method removed from Server interface once HORNETQ-720 is
+ * finished.
+ */
public synchronized ReplicationEndpoint connectToReplicationEndpoint(final Channel channel) throws Exception
{
if (!configuration.isBackup())
13 years, 6 months