svn commit: r1813263 - in /jackrabbit/oak/trunk/oak-segment-tar/src/test: java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java resources/logback-test.xml

[frm]

Author: frm
Date: Wed Oct 25 10:04:46 2017
New Revision: 1813263

URL: http://svn.apache.org/viewvc?rev=1813263&view=rev
Log:
OAK-6829 - Improve debug logging of NetworkErrorProxy

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java
    jackrabbit/oak/trunk/oak-segment-tar/src/test/resources/logback-test.xml

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java?rev=1813263&r1=1813262&r2=1813263&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java
 Wed Oct 25 10:04:46 2017
@@ -18,6 +18,7 @@
 package org.apache.jackrabbit.oak.segment.test.proxy;
 
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
@@ -36,6 +37,8 @@ class ForwardHandler extends ChannelInbo
 
     private static final Logger log = 
LoggerFactory.getLogger(ForwardHandler.class);
 
+    private static final AtomicInteger threadNumber = new AtomicInteger(1);
+
     private final String targetHost;
 
     private final int targetPort;
@@ -60,7 +63,9 @@ class ForwardHandler extends ChannelInbo
 
     @Override
     public void channelRegistered(final ChannelHandlerContext ctx) throws 
Exception {
-        group = new NioEventLoopGroup();
+        group = new NioEventLoopGroup(0, r -> {
+            return new Thread(r, String.format("forward-handler-%d", 
threadNumber.getAndIncrement()));
+        });
         Bootstrap b = new Bootstrap()
                 .group(group)
                 .channel(NioSocketChannel.class)

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java?rev=1813263&r1=1813262&r2=1813263&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java
 Wed Oct 25 10:04:46 2017
@@ -20,7 +20,9 @@
 package org.apache.jackrabbit.oak.segment.test.proxy;
 
 import java.io.Closeable;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
@@ -37,6 +39,10 @@ public class NetworkErrorProxy implement
 
     private static final Logger log = 
LoggerFactory.getLogger(NetworkErrorProxy.class);
 
+    private static final AtomicInteger bossThreadNumber = new AtomicInteger(1);
+
+    private static final AtomicInteger workerThreadNumber = new 
AtomicInteger(1);
+
     private static final int DEFAULT_FLIP_POSITION = -1;
 
     private static final int DEFAULT_SKIP_POSITION = -1;
@@ -57,9 +63,13 @@ public class NetworkErrorProxy implement
 
     private Channel server;
 
-    private EventLoopGroup boss = new NioEventLoopGroup();
-
-    private EventLoopGroup worker = new NioEventLoopGroup();
+    private EventLoopGroup boss = new NioEventLoopGroup(0, r -> {
+        return new Thread(r, String.format("proxy-boss-%d", 
bossThreadNumber.getAndIncrement()));
+    });
+
+    private EventLoopGroup worker = new NioEventLoopGroup(0, r -> {
+        return new Thread(r, String.format("proxy-worker-%d", 
workerThreadNumber.getAndIncrement()));
+    });
 
     public NetworkErrorProxy(int inboundPort, String outboundHost, int 
outboundPort) {
         this.inboundPort = inboundPort;

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/resources/logback-test.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/resources/logback-test.xml?rev=1813263&r1=1813262&r2=1813263&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/resources/logback-test.xml 
(original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/resources/logback-test.xml 
Wed Oct 25 10:04:46 2017
@@ -22,6 +22,7 @@
     </appender>
 
     <logger name="org.apache.jackrabbit.oak.segment.standby" level="DEBUG" />
+    <logger name="org.apache.jackrabbit.oak.segment.test.proxy" level="DEBUG" 
/>
 
     <root level="INFO">
         <appender-ref ref="console"/>