From 76d522c12518e855948977c6479a9604a83ddb71 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 24 Feb 2022 02:11:36 +0000 Subject: [PATCH 1/4] Bumping versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b72062ff..4b63e7d3 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.2-SNAPSHOT From 7817046f772acce0fd638b7057ee3dbd71524607 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 24 Feb 2022 13:54:37 -0500 Subject: [PATCH 2/4] Fixes DefaultOkHttpClientFactoryTest to not use reflection --- .../DefaultOkHttpClientFactoryTest.java | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactoryTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactoryTest.java index eb69a234..cb2b66f0 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactoryTest.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactoryTest.java @@ -16,17 +16,12 @@ package org.springframework.cloud.commons.httpclient; -import java.lang.reflect.Field; import java.util.concurrent.TimeUnit; -import javax.net.ssl.HostnameVerifier; - import okhttp3.ConnectionPool; import okhttp3.OkHttpClient; import org.junit.jupiter.api.Test; -import org.springframework.util.ReflectionUtils; - import static org.assertj.core.api.BDDAssertions.then; /** @@ -41,23 +36,11 @@ public class DefaultOkHttpClientFactoryTest { ConnectionPool pool = poolFactory.create(4, 5, TimeUnit.DAYS); OkHttpClient httpClient = okHttpClientFactory.createBuilder(true).connectTimeout(2, TimeUnit.MILLISECONDS) .readTimeout(3, TimeUnit.HOURS).followRedirects(true).connectionPool(pool).build(); - int connectTimeout = getField(httpClient, "connectTimeout"); - then(connectTimeout).isEqualTo(2); - int readTimeout = getField(httpClient, "readTimeout"); - then(readTimeout).isEqualTo(TimeUnit.HOURS.toMillis(3)); - boolean followRedirects = getField(httpClient, "followRedirects"); - then(followRedirects).isTrue(); - ConnectionPool poolFromClient = getField(httpClient, "connectionPool"); - then(poolFromClient).isEqualTo(pool); - HostnameVerifier hostnameVerifier = getField(httpClient, "hostnameVerifier"); - then(OkHttpClientFactory.TrustAllHostnames.class.isInstance(hostnameVerifier)).isTrue(); - } - - protected T getField(Object target, String name) { - Field field = ReflectionUtils.findField(target.getClass(), name); - ReflectionUtils.makeAccessible(field); - Object value = ReflectionUtils.getField(field, target); - return (T) value; + then(httpClient.connectTimeoutMillis()).isEqualTo(2); + then(httpClient.readTimeoutMillis()).isEqualTo(TimeUnit.HOURS.toMillis(3)); + then(httpClient.followRedirects()).isTrue(); + then(httpClient.connectionPool()).isEqualTo(pool); + then(OkHttpClientFactory.TrustAllHostnames.class.isInstance(httpClient.hostnameVerifier())).isTrue(); } } From 88c6a9e31f41880ba3a887b5c32c29da94bfd49e Mon Sep 17 00:00:00 2001 From: jizhuozhi <1218060852@qq.com> Date: Mon, 7 Mar 2022 22:24:43 +0800 Subject: [PATCH 3/4] Enforces the order of RoundRobinLoadBalancer when positive overflow (#1077) --- .../core/RoundRobinLoadBalancer.java | 8 ++- .../core/RoundRobinLoadBalancerTest.java | 59 +++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancerTest.java diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java index dc15f340..1b21044a 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java @@ -36,6 +36,7 @@ import org.springframework.cloud.client.loadbalancer.Response; * * @author Spencer Gibb * @author Olga Maciaszek-Sharma + * @author Zhuozhi JI */ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalancer { @@ -98,8 +99,11 @@ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalance } return new EmptyResponse(); } - // TODO: enforce order? - int pos = Math.abs(this.position.incrementAndGet()); + + int pos = this.position.incrementAndGet(); + if (pos < 0) { + pos = pos & Integer.MAX_VALUE; + } ServiceInstance instance = instances.get(pos % instances.size()); diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancerTest.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancerTest.java new file mode 100644 index 00000000..20a1bb89 --- /dev/null +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancerTest.java @@ -0,0 +1,59 @@ +/* + * Copyright 2012-2022 the original author or authors. + * + * 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 org.springframework.cloud.loadbalancer.core; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; + +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.loadbalancer.support.SimpleObjectProvider; + +import static java.lang.Integer.MAX_VALUE; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +/** + * @author Zhuozhi JI + */ +class RoundRobinLoadBalancerTest { + + @Test + void shouldEnforceOrderWhenPositiveOverflow() { + List instances = new ArrayList<>(); + for (int i = 0; i < 10; i++) { + ServiceInstance instance = mock(ServiceInstance.class); + when(instance.getInstanceId()).thenReturn(i + ""); + instances.add(instance); + } + SameInstancePreferenceServiceInstanceListSupplier supplier = mock( + SameInstancePreferenceServiceInstanceListSupplier.class); + when(supplier.get(any())).thenReturn(Flux.just(instances)); + + RoundRobinLoadBalancer loadBalancer = new RoundRobinLoadBalancer(new SimpleObjectProvider<>(supplier), + "shouldStartFromZeroWhenPositiveOverflow", MAX_VALUE); + + for (int i = 0; i < 10; i++) { + ServiceInstance chosen = loadBalancer.choose().block().getServer(); + assertThat(chosen.getInstanceId()).isEqualTo(i + ""); + } + } +} From 608215401074e040a77120e98742d1c53f0ad445 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 7 Mar 2022 15:38:33 +0100 Subject: [PATCH 4/4] Reformat. --- .../cloud/loadbalancer/core/RoundRobinLoadBalancerTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancerTest.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancerTest.java index 20a1bb89..7d79fe28 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancerTest.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancerTest.java @@ -56,4 +56,5 @@ class RoundRobinLoadBalancerTest { assertThat(chosen.getInstanceId()).isEqualTo(i + ""); } } + }