Merge #2733 into 2.0.0-M4

reactor · Mar 27, 2023 · 402de1e · 402de1e
2 parents b00cede + cbf9f2d
commit 402de1e
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 3 deletions.
diff --git a/reactor-netty5-core/src/main/java/reactor/netty5/resources/PooledConnectionProvider.java b/reactor-netty5-core/src/main/java/reactor/netty5/resources/PooledConnectionProvider.java
@@ -240,7 +240,7 @@ public final void disposeWhen(SocketAddress address) {
 		toDispose.forEach(e -> {
 			if (channelPools.remove(e.getKey(), e.getValue())) {
 				if (log.isDebugEnabled()) {
-					log.debug("ConnectionProvider[name={}]: Disposing pool for [{}]", name, e.getKey().fqdn);
+					log.debug("ConnectionProvider[name={}]: Disposing pool for [{}]", name, e.getKey().holder);
 				}
 				String id = e.getKey().hashCode() + "";
 				PoolFactory<T> poolFactory = poolFactory(address);
@@ -362,7 +362,7 @@ final void disposeInactivePoolsInBackground() {
 			toDispose.forEach(e -> {
 				if (channelPools.remove(e.getKey(), e.getValue())) {
 					if (log.isDebugEnabled()) {
-						log.debug("ConnectionProvider[name={}]: Disposing inactive pool for [{}]", name, e.getKey().fqdn);
+						log.debug("ConnectionProvider[name={}]: Disposing inactive pool for [{}]", name, e.getKey().holder);
 					}
 					e.getValue().dispose();
 				}
@@ -631,7 +631,14 @@ static final class PoolKey {
 		final int pipelineKey;
 
 		PoolKey(SocketAddress holder, int pipelineKey) {
-			this.fqdn = holder.toString();
+			String fqdn = null;
+			if (holder instanceof InetSocketAddress inetSocketAddress) {
+				if (!inetSocketAddress.isUnresolved()) {
+					// Use FQDN as a tie-breaker over IP's
+					fqdn = inetSocketAddress.getHostString().toLowerCase();
+				}
+			}
+			this.fqdn = fqdn;
 			this.holder = holder;
 			this.pipelineKey = pipelineKey;
 		}

diff --git a/reactor-netty5-core/src/test/java/reactor/netty5/resources/PoolKeyTest.java b/reactor-netty5-core/src/test/java/reactor/netty5/resources/PoolKeyTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2023 VMware, Inc. or its affiliates, All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package reactor.netty5.resources;
+
+import org.junit.jupiter.api.Test;
+import reactor.netty5.resources.PooledConnectionProvider.PoolKey;
+import reactor.netty5.transport.AddressUtils;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class PoolKeyTest {
+
+	@Test
+	void test() {
+		Set<PoolKey> set = new LinkedHashSet<>();
+		PoolKey key1 = new PoolKey(AddressUtils.createUnresolved("wikipedia.org", 80), 0);
+		assertThat(set.add(key1)).isTrue();
+		PoolKey key2 = new PoolKey(AddressUtils.createUnresolved("en.wikipedia.org", 80), 0);
+		assertThat(set.add(key2)).isTrue();
+		PoolKey key3 = new PoolKey(AddressUtils.createUnresolved("wikipedia.ORG", 80), 0);
+		assertThat(set.add(key3)).isFalse();
+		PoolKey key4 = new PoolKey(AddressUtils.createUnresolved("en.wikipedia.ORG", 80), 0);
+		assertThat(set.add(key4)).isFalse();
+		PoolKey key5 = new PoolKey(AddressUtils.createResolved("wikipedia.org", 80), 0);
+		assertThat(set.add(key5)).isTrue();
+		PoolKey key6 = new PoolKey(AddressUtils.createResolved("en.wikipedia.org", 80), 0);
+		assertThat(set.add(key6)).isTrue();
+		PoolKey key7 = new PoolKey(AddressUtils.createResolved("wikipedia.ORG", 80), 0);
+		assertThat(set.add(key7)).isFalse();
+		PoolKey key8 = new PoolKey(AddressUtils.createResolved("en.wikipedia.ORG", 80), 0);
+		assertThat(set.add(key8)).isFalse();
+		PoolKey key9 = new PoolKey(AddressUtils.createUnresolved("127.0.0.1", 80), 0);
+		assertThat(set.add(key9)).isTrue();
+		PoolKey key10 = new PoolKey(AddressUtils.createUnresolved("[::1]", 80), 0);
+		assertThat(set.add(key10)).isTrue();
+		PoolKey key11 = new PoolKey(AddressUtils.createUnresolved("127.0.0.1", 80), 0);
+		assertThat(set.add(key11)).isFalse();
+		PoolKey key12 = new PoolKey(AddressUtils.createUnresolved("[::1]", 80), 0);
+		assertThat(set.add(key12)).isFalse();
+		PoolKey key13 = new PoolKey(AddressUtils.createUnresolved("127.0.0.1", 443), 0);
+		assertThat(set.add(key13)).isTrue();
+		PoolKey key14 = new PoolKey(AddressUtils.createUnresolved("[::1]", 443), 0);
+		assertThat(set.add(key14)).isTrue();
+		assertThat(set.size()).isEqualTo(8);
+	}
+
+}