svn commit: r1727831 - in /jackrabbit/oak/trunk/oak-tarmk-standby/src: main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/ test/java/org/apache/jackrabbit/oak/plugins/segment/standby/

[al...@apache.org]

Author: alexparvulescu
Date: Sun Jan 31 15:02:36 2016
New Revision: 1727831

URL: http://svn.apache.org/viewvc?rev=1727831&view=rev
Log:
OAK-3961 Cold Standby revisit timeout setup

Modified:
    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/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java

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=1727831&r1=1727830&r2=1727831&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 15:02:36 2016
@@ -31,6 +31,7 @@ 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;
@@ -162,6 +163,8 @@ public final class StandbyClient impleme
                     if (sslContext != null) {
                         p.addLast(sslContext.newHandler(ch.alloc()));
                     }
+                    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));

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=1727831&r1=1727830&r2=1727831&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 15:02:36 2016
@@ -22,6 +22,7 @@ import static org.apache.jackrabbit.oak.
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.timeout.ReadTimeoutHandler;
 import io.netty.util.concurrent.DefaultEventExecutorGroup;
 import io.netty.util.concurrent.EventExecutorGroup;
 
@@ -90,6 +91,7 @@ public class StandbyClientHandler extend
         }
 
         log.debug("updating current head to " + head);
+        ctx.pipeline().remove(ReadTimeoutHandler.class);
         ctx.pipeline().remove(RecordIdDecoder.class);
         ctx.pipeline().remove(this);
         ctx.pipeline().addLast(new ReplyDecoder(store));

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=1727831&r1=1727830&r2=1727831&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 15:02:36 2016
@@ -150,7 +150,7 @@ public class FailoverIPRangeTest extends
         addTestContent(store, "server");
         storeS.flush();  // this speeds up the test a little bit...
 
-        StandbyClient cl = newStandbyClient(storeC);
+        StandbyClient cl =  new StandbyClient(host, port, storeC, false, timeout, false);
         cl.run();
 
         try {