Revert "Revert "fix polarisWeightedRandom""

This reverts commit 54cdc96591.
pull/970/head
seanyu 2 years ago
parent 54cdc96591
commit cf4d2bfee4

@ -77,11 +77,11 @@ public class PolarisLoadBalancerClientConfiguration {
@Bean
@ConditionalOnMissingBean
@ConditionalOnProperty(value = "spring.cloud.polaris.loadbalancer.strategy", havingValue = "polarisWeighted")
@ConditionalOnProperty(value = "spring.cloud.polaris.loadbalancer.strategy", havingValue = "polarisWeightedRandom")
public ReactorLoadBalancer<ServiceInstance> polarisWeightedLoadBalancer(Environment environment,
LoadBalancerClientFactory loadBalancerClientFactory, RouterAPI routerAPI) {
String name = environment.getProperty(LoadBalancerClientFactory.PROPERTY_NAME);
return new PolarisWeightedLoadBalancer(name,
return new PolarisWeightedRandomLoadBalancer(name,
loadBalancerClientFactory.getLazyProvider(name, ServiceInstanceListSupplier.class), routerAPI);
}

@ -53,7 +53,7 @@ import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
*/
public class PolarisRingHashLoadBalancer implements ReactorServiceInstanceLoadBalancer {
private static final Logger log = LoggerFactory.getLogger(PolarisWeightedLoadBalancer.class);
private static final Logger log = LoggerFactory.getLogger(PolarisWeightedRandomLoadBalancer.class);
private final String serviceId;

@ -50,9 +50,9 @@ import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
*
* @author <a href="mailto:liaochuntao@live.com">liaochuntao</a>
*/
public class PolarisWeightedLoadBalancer implements ReactorServiceInstanceLoadBalancer {
public class PolarisWeightedRandomLoadBalancer implements ReactorServiceInstanceLoadBalancer {
private static final Logger log = LoggerFactory.getLogger(PolarisWeightedLoadBalancer.class);
private static final Logger log = LoggerFactory.getLogger(PolarisWeightedRandomLoadBalancer.class);
private final String serviceId;
@ -60,7 +60,7 @@ public class PolarisWeightedLoadBalancer implements ReactorServiceInstanceLoadBa
private ObjectProvider<ServiceInstanceListSupplier> supplierObjectProvider;
public PolarisWeightedLoadBalancer(String serviceId, ObjectProvider<ServiceInstanceListSupplier> supplierObjectProvider, RouterAPI routerAPI) {
public PolarisWeightedRandomLoadBalancer(String serviceId, ObjectProvider<ServiceInstanceListSupplier> supplierObjectProvider, RouterAPI routerAPI) {
this.serviceId = serviceId;
this.supplierObjectProvider = supplierObjectProvider;
this.routerAPI = routerAPI;

@ -136,8 +136,8 @@
"description": "random load balancer."
},
{
"value": "polarisWeighted",
"description": "polaris weighted load balancer."
"value": "polarisWeightedRandom",
"description": "polaris weighted random load balancer."
},
{
"value": "polarisRingHash",

@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
* @author Haotian Zhang
*/
@ExtendWith(MockitoExtension.class)
public class PolarisWeightedLoadBalancerAutoConfigurationTest {
public class PolarisWeightedRandomLoadBalancerAutoConfigurationTest {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)

@ -52,12 +52,12 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* Test for {@link PolarisWeightedLoadBalancer}.
* Test for {@link PolarisWeightedRandomLoadBalancer}.
*
* @author rod.xu
*/
@ExtendWith(MockitoExtension.class)
public class PolarisWeightedLoadBalancerTest {
public class PolarisWeightedRandomLoadBalancerTest {
private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils;
private static Instance testInstance;
@ -97,8 +97,8 @@ public class PolarisWeightedLoadBalancerTest {
when(routerAPI.processLoadBalance(any())).thenReturn(mockLbRes);
// request construct and execute invoke
PolarisWeightedLoadBalancer polarisWeightedLoadBalancer = new PolarisWeightedLoadBalancer(LOCAL_SERVICE, supplierObjectProvider, routerAPI);
Mono<Response<ServiceInstance>> responseMono = polarisWeightedLoadBalancer.choose(request);
PolarisWeightedRandomLoadBalancer polarisWeightedRandomLoadBalancer = new PolarisWeightedRandomLoadBalancer(LOCAL_SERVICE, supplierObjectProvider, routerAPI);
Mono<Response<ServiceInstance>> responseMono = polarisWeightedRandomLoadBalancer.choose(request);
ServiceInstance serviceInstance = responseMono.block().getServer();
// verify method has invoked
Loading…
Cancel
Save