From c7a171da056180410153fd143b9b2a792a63045d Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Thu, 21 Jan 2016 14:33:11 +0000 Subject: [PATCH] taken out this code as it was causing isssue for OZAN when re starting an exisign code that had gone down in the cluser, as the old logic was preventing the data that originted from it flowing back in. --- .../chronicle/map/ReplicatedChronicleMap.java | 6 +-- .../TCPSocketReplicationBootStrapTest.java | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java index 3d1af9d9e..5a0dda846 100755 --- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java @@ -742,11 +742,6 @@ final class ReplicatedChronicleMap map1 = ChronicleMapBuilder.of(java.lang.String + .class, Integer.class) + .entries(Short.MAX_VALUE) + .instance() + .replicated(SingleChronicleHashReplication.builder() + .tcpTransportAndNetwork(TcpTransportAndNetworkConfig.of(5035)) + .createWithId((byte) 1)) + .create(); + + + for (int i = 0; i < 500; i++) { + map1.put("1st map " + Integer.toString(i), i); + } + + + final ChronicleMap map2 = ChronicleMapBuilder.of(java.lang.String + .class, Integer.class) + .entries(Short.MAX_VALUE) + .instance() + .replicated(SingleChronicleHashReplication.builder() + .tcpTransportAndNetwork(TcpTransportAndNetworkConfig.of(5036, new + InetSocketAddress[]{new InetSocketAddress("localhost", 5035)})) + .createWithId((byte) 2)) + .create(); + + + while (map2.size() != 500 || map1.size() != 500 || !map1.equals(map2)) { + Thread.yield(); + } + + map1.close(); + + final ChronicleMap map1a = ChronicleMapBuilder.of(java.lang + .String + .class, Integer.class) + .entries(Short.MAX_VALUE) + .instance() + .replicated(SingleChronicleHashReplication.builder() + .tcpTransportAndNetwork(TcpTransportAndNetworkConfig.of(5039, new + InetSocketAddress[]{new InetSocketAddress("localhost", 5036)})) + .createWithId((byte) 1)) + .create(); + + while (map2.size() != 500 || map1a.size() != 500 || !map1a.equals(map2)) { + Thread.yield(); + } + + Assert.assertEquals(map1a, map2); + } + + @Test public void testReplicationWhileModifying() throws IOException, InterruptedException {