SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use com.netflix.loadbalancer.DummyPing instead of NoopPing

Browse Source 
use `com.netflix.loadbalancer.DummyPing` instead of `NoopPing`

This eliminates the startup of another theadpool.

fixes gh-1504
This commit is contained in:
Bertrand Renuart
2016-12-05 19:26:05 +01:00
committed by Spencer Gibb
parent edb14e2a6b
commit 8b7d6848b3
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java
View File

@@ -40,11 +40,11 @@ import com.netflix.client.RetryHandler;
import com.netflix.client.config.DefaultClientConfigImpl;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.ConfigurationBasedServerList;
import com.netflix.loadbalancer.DummyPing;
import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.IPing;
import com.netflix.loadbalancer.IRule;
import com.netflix.loadbalancer.LoadBalancerBuilder;
import com.netflix.loadbalancer.NoOpPing;
import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import com.netflix.loadbalancer.ServerListFilter;
@@ -101,7 +101,7 @@ public class RibbonClientConfiguration {
if (this.propertiesFactory.isSet(IPing.class, name)) {
return this.propertiesFactory.get(IPing.class, config, name);
}
return new NoOpPing();
return new DummyPing();
}
@Bean

6
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorIntegrationTests.java
View File

@@ -29,7 +29,7 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.netflix.loadbalancer.ConfigurationBasedServerList;
import com.netflix.loadbalancer.NoOpPing;
import com.netflix.loadbalancer.DummyPing;
import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ZoneAvoidanceRule;
import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
@@ -56,8 +56,8 @@ public class RibbonClientPreprocessorIntegrationTests {
}
@Test
public void pingDefaultsToNoOp() throws Exception {
NoOpPing.class.cast(getLoadBalancer().getPing());
public void pingDefaultsToDummy() throws Exception {
DummyPing.class.cast(getLoadBalancer().getPing());
}
@Test

6
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java
View File

@@ -69,9 +69,9 @@ public class RibbonClientPreprocessorPropertiesOverridesIntegrationTests {
}
@Test
public void pingOverridesToDummy() throws Exception {
DummyPing.class.cast(getLoadBalancer("foo2").getPing());
NoOpPing.class.cast(getLoadBalancer("bar").getPing());
public void pingOverridesToNoOp() throws Exception {
NoOpPing.class.cast(getLoadBalancer("foo2").getPing());
DummyPing.class.cast(getLoadBalancer("bar").getPing());
}
@Test

2
spring-cloud-netflix-core/src/test/resources/application.yml
View File

@@ -29,7 +29,7 @@ foo:
# for RibbonClientPreprocessorPropertiesOverridesIntegrationTests
foo2:
ribbon:
NFLoadBalancerPingClassName: com.netflix.loadbalancer.DummyPing
NFLoadBalancerPingClassName: com.netflix.loadbalancer.NoOpPing
NFLoadBalancerRuleClassName: com.netflix.loadbalancer.RandomRule
NIWSServerListClassName: org.springframework.cloud.netflix.ribbon.test.TestServerList
NIWSServerListFilterClassName: com.netflix.loadbalancer.ServerListSubsetFilter