HCOLL-329 fixing the bootstrapping timestamp issue

Conflicts:
	src/main/java/net/openhft/chronicle/map/ChannelProvider.java
	src/main/java/net/openhft/chronicle/map/Replica.java
	src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
	src/main/java/net/openhft/chronicle/map/SharedSegment.java
	src/main/java/net/openhft/chronicle/map/TcpReplicator.java
	src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
This commit is contained in:
Rob Austin
2015-07-25 22:33:24 +03:00
committed by leventov
parent da06ba106e
commit fcd872c643
9 changed files with 110 additions and 43 deletions
@@ -21,7 +21,6 @@ package net.openhft.chronicle.map;
import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import java.io.Closeable;
@@ -56,12 +55,17 @@ public class TCPSocketReplication3wayPutReturnsNullTest {
.replication(identifier, tcpConfig).create();
}
int portOffset = 0;
@Before
public void setup() throws IOException {
map1 = newTcpSocketShmIntString((byte) 1, 8026, new InetSocketAddress("localhost", 8027),
new InetSocketAddress("localhost", 8028));
map2 = newTcpSocketShmIntString((byte) 2, 8027, new InetSocketAddress("localhost", 8028));
map3 = newTcpSocketShmIntString((byte) 3, 8028);
map1 = newTcpSocketShmIntString((byte) 1, portOffset + 8026, new InetSocketAddress
("localhost", portOffset + 8027),
new InetSocketAddress("localhost", portOffset + 8028));
map2 = newTcpSocketShmIntString((byte) 2, portOffset + 8027, new InetSocketAddress
("localhost", portOffset + 8028));
map3 = newTcpSocketShmIntString((byte) 3, portOffset + 8028);
portOffset += 10;
}
@After
@@ -18,11 +18,11 @@ public class TestReplication {
TcpTransportAndNetworkConfig tcpConfigServer1 =
TcpTransportAndNetworkConfig.of(8082);
TcpTransportAndNetworkConfig.of(8092);
TcpTransportAndNetworkConfig tcpConfigServer2 =
TcpTransportAndNetworkConfig.of(8083, new InetSocketAddress("localhost",
8082));
TcpTransportAndNetworkConfig.of(8093, new InetSocketAddress("localhost",
8092));
final ChronicleMap<Integer, Integer> map2 = ChronicleMapBuilder.of(Integer.class,
Integer.class)
@@ -40,7 +40,6 @@ public class TestReplication {
}
for (int i = 0; i < 10; i++) {
Thread.sleep(100);
System.out.println(map2.size());
}