Author: alexparvulescu Date: Sun Jan 31 13:20:13 2016 New Revision: 1727813
URL: http://svn.apache.org/viewvc?rev=1727813&view=rev Log: OAK-3961 Cold Standby revisit timeout setup Modified: jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java Modified: jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml Sun Jan 31 13:20:13 2016 @@ -89,7 +89,6 @@ </systemPropertyVariables> <excludes> <!-- excluding long running tests --> - <exclude>**/BrokenNetworkTest.java</exclude> <exclude>**/FailoverIPRangeTest.java</exclude> <exclude>**/BulkTest.java</exclude> <exclude>**/MBeanTest.java</exclude> Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java Sun Jan 31 13:20:13 2016 @@ -31,7 +31,6 @@ import io.netty.handler.codec.compressio import io.netty.handler.codec.string.StringEncoder; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.util.InsecureTrustManagerFactory; -import io.netty.handler.timeout.ReadTimeoutHandler; import io.netty.util.CharsetUtil; import io.netty.util.concurrent.DefaultEventExecutorGroup; import io.netty.util.concurrent.EventExecutorGroup; @@ -84,15 +83,6 @@ public final class StandbyClient impleme private long syncStartTimestamp; private long syncEndTimestamp; - public StandbyClient(String host, int port, SegmentStore store) throws SSLException { - this(host, port, store, false, 10000); - } - - public StandbyClient(String host, int port, SegmentStore store, - boolean secure, int readTimeoutMs) throws SSLException { - this(host, port, store, secure, readTimeoutMs, false); - } - public StandbyClient(String host, int port, SegmentStore store, boolean secure, int readTimeoutMs, boolean autoClean) throws SSLException { @@ -172,9 +162,6 @@ public final class StandbyClient impleme if (sslContext != null) { p.addLast(sslContext.newHandler(ch.alloc())); } - // WriteTimeoutHandler & ReadTimeoutHandler - p.addLast("readTimeoutHandler", new ReadTimeoutHandler( - readTimeoutMs, TimeUnit.MILLISECONDS)); p.addLast(new StringEncoder(CharsetUtil.UTF_8)); p.addLast(new SnappyFramedDecoder(true)); p.addLast(new RecordIdDecoder(store)); @@ -208,11 +195,11 @@ public final class StandbyClient impleme private void shutdownNetty() { if (group != null && !group.isShuttingDown()) { - group.shutdownGracefully(1, 1, TimeUnit.SECONDS) + group.shutdownGracefully(0, 1, TimeUnit.SECONDS) .syncUninterruptibly(); } if (executor != null && !executor.isShuttingDown()) { - executor.shutdownGracefully(1, 1, TimeUnit.SECONDS) + executor.shutdownGracefully(0, 1, TimeUnit.SECONDS) .syncUninterruptibly(); } if (handler != null) { Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java Sun Jan 31 13:20:13 2016 @@ -122,7 +122,7 @@ public class StandbyClientHandler extend ctx = null; } if (loaderExecutor != null && !loaderExecutor.isShuttingDown()) { - loaderExecutor.shutdownGracefully(1, 1, TimeUnit.SECONDS) + loaderExecutor.shutdownGracefully(0, 1, TimeUnit.SECONDS) .syncUninterruptibly(); } } Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java Sun Jan 31 13:20:13 2016 @@ -154,10 +154,10 @@ public class StandbyServer implements St log.error("can't unregister standby status mbean", e); } if (bossGroup != null && !bossGroup.isShuttingDown()) { - bossGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly(); + bossGroup.shutdownGracefully(0, 1, TimeUnit.SECONDS).syncUninterruptibly(); } if (workerGroup != null && !workerGroup.isShuttingDown()) { - workerGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly(); + workerGroup.shutdownGracefully(0, 1, TimeUnit.SECONDS).syncUninterruptibly(); } handler.state = STATUS_CLOSED; } Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java Sun Jan 31 13:20:13 2016 @@ -96,10 +96,10 @@ public class NetworkErrorProxy { f.channel().close(); } if (bossGroup != null && !bossGroup.isShuttingDown()) { - bossGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly(); + bossGroup.shutdownGracefully(0, 150, TimeUnit.MILLISECONDS).syncUninterruptibly(); } if (workerGroup != null && !workerGroup.isShuttingDown()) { - workerGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly(); + workerGroup.shutdownGracefully(0, 150, TimeUnit.MILLISECONDS).syncUninterruptibly(); } } } Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java Sun Jan 31 13:20:13 2016 @@ -114,7 +114,6 @@ public class BrokenNetworkTest extends T } private void useProxy(boolean ssl, int skipPosition, int skipBytes, int flipPosition, boolean intermediateChange) throws Exception { - int proxyPort = Integer.valueOf(System.getProperty("standby.proxy.port", "4711")); NetworkErrorProxy p = new NetworkErrorProxy(proxyPort, LOCALHOST, port); p.skipBytes(skipPosition, skipBytes); p.flipByte(flipPosition); @@ -126,7 +125,7 @@ public class BrokenNetworkTest extends T addTestContent(store, "server"); storeS.flush(); // this speeds up the test a little bit... - StandbyClient cl = new StandbyClient(LOCALHOST, proxyPort, storeC, ssl, 5000); + StandbyClient cl = newStandbyClient(storeC, proxyPort, ssl); cl.run(); try { Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java Sun Jan 31 13:20:13 2016 @@ -113,7 +113,7 @@ public class BulkTest extends TestBase { server.start(); System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Bar"); - StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, useSSL, 5000); + StandbyClient cl = newStandbyClient(storeC, port, useSSL); final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer(); ObjectName status = new ObjectName(StandbyStatusMBean.JMX_NAME + ",id=*"); Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java Sun Jan 31 13:20:13 2016 @@ -93,11 +93,12 @@ public class DataStoreTestBase extends T FileStore secondary = getSecondary(); NodeStore store = new SegmentNodeStore(primary); - final StandbyServer server = new StandbyServer(getPort(), primary); + final StandbyServer server = new StandbyServer(port, primary); server.start(); byte[] data = addTestContent(store, "server", blobSize); + primary.flush(); - StandbyClient cl = new StandbyClient("127.0.0.1", getPort(), secondary); + StandbyClient cl = newStandbyClient(secondary); cl.run(); try { @@ -157,7 +158,6 @@ public class DataStoreTestBase extends T } private void useProxy(int skipPosition, int skipBytes, int flipPosition, boolean intermediateChange) throws Exception { - int proxyPort = Integer.valueOf(System.getProperty("standby.proxy.port", "51913")); final int mb = 1 * 1024 * 1024; int blobSize = 5 * mb; FileStore primary = getPrimary(); @@ -169,11 +169,12 @@ public class DataStoreTestBase extends T p.run(); NodeStore store = new SegmentNodeStore(primary); - final StandbyServer server = new StandbyServer(getPort(), primary); + final StandbyServer server = new StandbyServer(port, primary); server.start(); byte[] data = addTestContent(store, "server", blobSize); + primary.flush(); - StandbyClient cl = new StandbyClient("127.0.0.1", proxyPort, secondary); + StandbyClient cl = newStandbyClient(secondary, proxyPort); cl.run(); try { @@ -185,6 +186,7 @@ public class DataStoreTestBase extends T if (intermediateChange) { blobSize = 2 * mb; data = addTestContent(store, "server", blobSize); + primary.flush(); } cl.run(); } Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java Sun Jan 31 13:20:13 2016 @@ -150,7 +150,7 @@ public class FailoverIPRangeTest extends addTestContent(store, "server"); storeS.flush(); // this speeds up the test a little bit... - StandbyClient cl = new StandbyClient(host, port, storeC); + StandbyClient cl = newStandbyClient(storeC); cl.run(); try { Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java Sun Jan 31 13:20:13 2016 @@ -27,7 +27,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static junit.framework.Assert.assertFalse; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertEquals; public class FailoverMultipleClientsTestIT extends TestBase { @@ -50,8 +50,8 @@ public class FailoverMultipleClientsTest SegmentTestUtils.addTestContent(store, "server"); storeS.flush(); // this speeds up the test a little bit... - StandbyClient cl1 = new StandbyClient("127.0.0.1", port, storeC); - StandbyClient cl2 = new StandbyClient("127.0.0.1", port, storeC2); + StandbyClient cl1 = newStandbyClient(storeC); + StandbyClient cl2 = newStandbyClient(storeC2); try { assertFalse("first client has invalid initial store!", storeS.getHead().equals(storeC.getHead())); @@ -66,6 +66,7 @@ public class FailoverMultipleClientsTest cl1.stop(); SegmentTestUtils.addTestContent(store, "test"); + storeS.flush(); cl1.run(); cl2.run(); Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java Sun Jan 31 13:20:13 2016 @@ -51,7 +51,7 @@ public class FailoverSslTestIT extends T addTestContent(store, "server"); storeS.flush(); // this speeds up the test a little bit... - StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, true, 5000); + StandbyClient cl = newStandbyClient(storeC, port, true); cl.run(); try { @@ -71,7 +71,7 @@ public class FailoverSslTestIT extends T addTestContent(store, "server"); storeS.flush(); // this speeds up the test a little bit... - StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC); + StandbyClient cl = newStandbyClient(storeC); cl.run(); try { @@ -91,7 +91,7 @@ public class FailoverSslTestIT extends T addTestContent(store, "server"); storeS.flush(); // this speeds up the test a little bit... - StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, true, 5000); + StandbyClient cl = newStandbyClient(storeC, port, true); cl.run(); try { Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java Sun Jan 31 13:20:13 2016 @@ -83,7 +83,7 @@ public class MBeanTest extends TestBase @Test public void testClientEmptyConfigNoServer() throws Exception { - final StandbyClient client = new StandbyClient("127.0.0.1", this.port, this.storeC); + final StandbyClient client = newStandbyClient(storeC); client.start(); final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer(); @@ -120,7 +120,7 @@ public class MBeanTest extends TestBase @Test public void testClientNoServer() throws Exception { System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Foo"); - final StandbyClient client = new StandbyClient("127.0.0.1", this.port, this.storeC); + final StandbyClient client = newStandbyClient(storeC); client.start(); final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer(); @@ -144,11 +144,11 @@ public class MBeanTest extends TestBase @Test @Ignore("OAK-2086") public void testClientAndServerEmptyConfig() throws Exception { - final StandbyServer server = new StandbyServer(this.port, this.storeS); + final StandbyServer server = new StandbyServer(port, this.storeS); server.start(); System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Bar"); - final StandbyClient client = new StandbyClient("127.0.0.1", this.port, this.storeC); + final StandbyClient client = newStandbyClient(storeC); client.start(); final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer(); Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java Sun Jan 31 13:20:13 2016 @@ -49,12 +49,14 @@ public class RecoverTestIT extends TestB NodeStore store = new SegmentNodeStore(storeS); DebugSegmentStore s = new DebugSegmentStore(storeS); + addTestContent(store, "server"); + storeS.flush(); + final StandbyServer server = new StandbyServer(port, s); s.createReadErrors = true; server.start(); - addTestContent(store, "server"); - StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC); + StandbyClient cl = newStandbyClient(storeC); cl.run(); try { @@ -81,7 +83,7 @@ public class RecoverTestIT extends TestB addTestContent(store, "server"); storeS.flush(); - StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC); + StandbyClient cl = newStandbyClient(storeC); try { assertFalse("stores are not expected to be equal", storeS.getHead().equals(storeC.getHead())); cl.run(); Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java Sun Jan 31 13:20:13 2016 @@ -67,12 +67,12 @@ public class StandbyTest extends TestBas FileStore secondary = getSecondary(); NodeStore store = new SegmentNodeStore(primary); - final StandbyServer server = new StandbyServer(getPort(), primary); + final StandbyServer server = new StandbyServer(port, primary); server.start(); byte[] data = addTestContent(store, "server", blobSize, 150); primary.flush(); - StandbyClient cl = new StandbyClient("127.0.0.1", getPort(), secondary); + StandbyClient cl = newStandbyClient(secondary); cl.run(); try { @@ -119,19 +119,4 @@ public class StandbyTest extends TestBas store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY); return data; } - - public static void main(String[] args) throws Exception { - File d = createTmpTargetDir("StandbyLiveTest"); - d.delete(); - d.mkdir(); - FileStore s = new FileStore(d, 256, false); - StandbyClient cl = new StandbyClient("127.0.0.1", 8023, s); - try { - cl.run(); - } finally { - s.close(); - cl.close(); - } - } - } Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java Sun Jan 31 13:20:13 2016 @@ -85,24 +85,25 @@ public class StandbyTestIT extends TestB */ @Test public void testSyncLoop() throws Exception { - final int mb = 1 * 1024 * 1024; - final int blobSize = 5 * mb; + final int blobSize = 25 * 1024; final int dataNodes = 5000; FileStore primary = getPrimary(); FileStore secondary = getSecondary(); NodeStore store = new SegmentNodeStore(primary); - final StandbyServer server = new StandbyServer(getPort(), primary); + final StandbyServer server = new StandbyServer(port, primary); server.start(); byte[] data = addTestContent(store, "server", blobSize, dataNodes); + primary.flush(); - StandbyClient cl = new StandbyClient("127.0.0.1", getPort(), secondary); + StandbyClient cl = newStandbyClient(secondary); try { for (int i = 0; i < 5; i++) { String cp = store.checkpoint(Long.MAX_VALUE); + primary.flush(); cl.run(); assertEquals(primary.getHead(), secondary.getHead()); assertTrue(store.release(cp)); Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java?rev=1727813&r1=1727812&r2=1727813&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java Sun Jan 31 13:20:13 2016 @@ -31,12 +31,21 @@ import org.apache.jackrabbit.oak.commons import org.apache.jackrabbit.oak.commons.FixturesHelper; import org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture; import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; +import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient; import org.junit.BeforeClass; public class TestBase { - int port = Integer.valueOf(System.getProperty("standby.server.port", "52800")); + + static final int port = Integer.getInteger("standby.server.port", + 52800); + + static final int proxyPort = Integer.getInteger( + "standby.proxy.port", 51913); + final static String LOCALHOST = "127.0.0.1"; + static final int timeout = Integer.getInteger("standby.test.timeout", 150); + private static final Set<Fixture> FIXTURES = FixturesHelper.getFixtures(); File directoryS; @@ -94,10 +103,6 @@ public class TestBase { return storeC; } - protected int getPort() { - return port; - } - public void setUpServerAndTwoClients() throws Exception { setUpServerAndClient(); @@ -123,4 +128,23 @@ public class TestBase { } catch (IOException e) { } } + + public static int getTestTimeout() { + return timeout; + } + + public StandbyClient newStandbyClient(FileStore store) throws Exception { + return newStandbyClient(store, port, false); + } + + public StandbyClient newStandbyClient(FileStore store, int port) + throws Exception { + return newStandbyClient(store, port, false); + } + + public StandbyClient newStandbyClient(FileStore store, int port, + boolean secure) throws Exception { + return new StandbyClient(LOCALHOST, port, store, secure, timeout, false); + } + }
