Introduce a way to flush a ChannelPool partition, close #679

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -25,6 +25,7 @@
 import com.ning.http.client.ListenableFuture;
 import com.ning.http.client.Request;
 import com.ning.http.client.providers.netty.channel.ChannelManager;
+import com.ning.http.client.providers.netty.channel.pool.ChannelPoolPartitionSelector;
 import com.ning.http.client.providers.netty.request.NettyRequestSender;
 
 import java.io.IOException;
@@ -85,4 +86,12 @@ public void close() {
     public <T> ListenableFuture<T> execute(Request request, final AsyncHandler<T> asyncHandler) throws IOException {
         return requestSender.sendRequest(request, asyncHandler, null, false);
     }
+
+    public void flushChannelPoolPartition(String partitionId) {
+        channelManager.flushPartition(partitionId);
+    }
+
+    public void flushChannelPoolPartitions(ChannelPoolPartitionSelector selector) {
+        channelManager.flushPartitions(selector);
+    }
 }

src/main/java/com/ning/http/client/providers/netty/channel/ChannelManager.java

@@ -44,6 +44,7 @@
 import com.ning.http.client.providers.netty.Callback;
 import com.ning.http.client.providers.netty.NettyAsyncHttpProviderConfig;
 import com.ning.http.client.providers.netty.channel.pool.ChannelPool;
+import com.ning.http.client.providers.netty.channel.pool.ChannelPoolPartitionSelector;
 import com.ning.http.client.providers.netty.channel.pool.DefaultChannelPool;
 import com.ning.http.client.providers.netty.channel.pool.NoopChannelPool;
 import com.ning.http.client.providers.netty.future.NettyResponseFuture;
@@ -435,4 +436,12 @@ public void call() throws Exception {
     public void drainChannel(final Channel channel, final NettyResponseFuture<?> future) {
         Channels.setAttribute(channel, newDrainCallback(future, channel, future.isKeepAlive(), getPartitionId(future)));
     }
+
+    public void flushPartition(String partitionId) {
+        channelPool.flushPartition(partitionId);
+    } 
+
+    public void flushPartitions(ChannelPoolPartitionSelector selector) {
+        channelPool.flushPartitions(selector);
+    }
 }

src/main/java/com/ning/http/client/providers/netty/channel/pool/ChannelPool.java

@@ -57,4 +57,18 @@ public interface ChannelPool {
      * Destroy all connections that has been cached by this instance.
      */
     void destroy();
+
+    /**
+     * Flush a partition
+     * 
+     * @param partitionId
+     */
+    void flushPartition(String partitionId);
+
+    /**
+     * Flush partitions based on a selector
+     * 
+     * @param selector
+     */
+    void flushPartitions(ChannelPoolPartitionSelector selector);
 }

src/main/java/com/ning/http/client/providers/netty/channel/pool/ChannelPoolPartitionSelector.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package com.ning.http.client.providers.netty.channel.pool;
+
+public interface ChannelPoolPartitionSelector {
+
+   boolean select(String partitionId); 
+}

src/main/java/com/ning/http/client/providers/netty/channel/pool/DefaultChannelPool.java

@@ -30,6 +30,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
@@ -303,4 +304,27 @@ private void close(Channel channel) {
         channelId2Creation.remove(channel.getId());
         Channels.silentlyCloseChannel(channel);
     }
+
+    private void flushPartition(String partitionId, ConcurrentLinkedQueue<IdleChannel> partition) {
+        if (partition != null) {
+            partitions.remove(partitionId);
+            for (IdleChannel idleChannel : partition)
+                close(idleChannel.channel);
+        }
+    }
+    
+    @Override
+    public void flushPartition(String partitionId) {
+        flushPartition(partitionId, partitions.get(partitionId));
+    }
+    
+    @Override
+    public void flushPartitions(ChannelPoolPartitionSelector selector) {
+
+        for (Map.Entry<String, ConcurrentLinkedQueue<IdleChannel>> partitionsEntry : partitions.entrySet()) {
+            String partitionId = partitionsEntry.getKey();
+            if (selector.select(partitionId))
+                flushPartition(partitionId, partitionsEntry.getValue());
+        }
+    }
 }

src/main/java/com/ning/http/client/providers/netty/channel/pool/NoopChannelPool.java

@@ -17,22 +17,35 @@
 
 public class NoopChannelPool implements ChannelPool {
 
+    @Override
     public boolean offer(Channel connection, String poolKey) {
         return false;
     }
 
+    @Override
     public Channel poll(String uri) {
         return null;
     }
 
+    @Override
     public boolean removeAll(Channel connection) {
         return false;
     }
 
+    @Override
     public boolean isOpen() {
         return true;
     }
 
+    @Override
     public void destroy() {
     }
+
+    @Override
+    public void flushPartition(String partitionId) {
+    }
+
+    @Override
+    public void flushPartitions(ChannelPoolPartitionSelector selector) {
+    }
 }

src/test/java/com/ning/http/client/async/netty/NettyConnectionPoolTest.java

@@ -28,6 +28,7 @@
 import com.ning.http.client.async.ProviderUtil;
 import com.ning.http.client.providers.netty.NettyAsyncHttpProviderConfig;
 import com.ning.http.client.providers.netty.channel.pool.ChannelPool;
+import com.ning.http.client.providers.netty.channel.pool.NoopChannelPool;
 
 import java.net.ConnectException;
 import java.util.concurrent.TimeUnit;
@@ -42,27 +43,17 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
     @Test(groups = { "standalone", "default_provider" })
     public void testInvalidConnectionsPool() {
 
-        ChannelPool cp = new ChannelPool() {
+        ChannelPool cp = new NoopChannelPool() {
 
+            @Override
             public boolean offer(Channel connection, String poolKey) {
                 return false;
             }
 
-            public Channel poll(String connection) {
-                return null;
-            }
-
-            public boolean removeAll(Channel connection) {
-                return false;
-            }
-
+            @Override
             public boolean isOpen() {
                 return false;
             }
-
-            public void destroy() {
-
-            }
         };
 
         NettyAsyncHttpProviderConfig providerConfig = new NettyAsyncHttpProviderConfig();
@@ -86,27 +77,12 @@ public void destroy() {
     @Test(groups = { "standalone", "default_provider" })
     public void testValidConnectionsPool() {
 
-        ChannelPool cp = new ChannelPool() {
+        ChannelPool cp = new NoopChannelPool() {
 
+            @Override
             public boolean offer(Channel connection, String poolKey) {
                 return true;
             }
-
-            public Channel poll(String connection) {
-                return null;
-            }
-
-            public boolean removeAll(Channel connection) {
-                return false;
-            }
-
-            public boolean isOpen() {
-                return true;
-            }
-
-            public void destroy() {
-
-            }
         };
 
         NettyAsyncHttpProviderConfig providerConfig = new NettyAsyncHttpProviderConfig();