[#690]fix issues when service is deleted and registered again (#692)

Author: liubao68

spring-cloud-huawei-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/ribbon/ServiceCombIPing.java

@@ -0,0 +1,69 @@
+/*
+
+ * Copyright (C) 2020-2022 Huawei Technologies Co., Ltd. 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
+ *
+ *     http://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 com.huaweicloud.servicecomb.discovery.ribbon;
+
+import java.util.List;
+
+import com.netflix.loadbalancer.AbstractServerList;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.IRule;
+import com.netflix.loadbalancer.Server;
+
+public class ServiceCombLoadBalancer implements ILoadBalancer {
+  private final IRule rule;
+
+  private final AbstractServerList<Server> serverList;
+
+  public ServiceCombLoadBalancer(IRule rule,
+      AbstractServerList<Server> serverList) {
+    this.rule = rule;
+    this.rule.setLoadBalancer(this);
+    this.serverList = serverList;
+  }
+
+  @Override
+  public void addServers(List<Server> newServers) {
+    // do nothing
+  }
+
+  @Override
+  public Server chooseServer(Object key) {
+    return this.rule.choose(key);
+  }
+
+  @Override
+  public void markServerDown(Server server) {
+    // do nothing
+  }
+
+  @Override
+  @SuppressWarnings("deprecation")
+  public List<Server> getServerList(boolean availableOnly) {
+    return serverList.getUpdatedListOfServers();
+  }
+
+  @Override
+  public List<Server> getReachableServers() {
+    return serverList.getUpdatedListOfServers();
+  }
+
+  @Override
+  public List<Server> getAllServers() {
+    return serverList.getUpdatedListOfServers();
+  }
+}

spring-cloud-huawei-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/ribbon/ServiceCombLoadBalancer.java

@@ -1,57 +1,55 @@
 /*
 
-  * Copyright (C) 2020-2022 Huawei Technologies Co., Ltd. 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
-  *
-  *     http://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.
-  */
+ * Copyright (C) 2020-2022 Huawei Technologies Co., Ltd. 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
+ *
+ *     http://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 com.huaweicloud.servicecomb.discovery.ribbon;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import com.huaweicloud.servicecomb.discovery.registry.ServiceCombRegistration;
 import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.IPing;
-import com.netflix.loadbalancer.ServerList;
-import com.netflix.loadbalancer.ServerListUpdater;
-
-/**
- * @Author wangqijun
- * @Date 17:15 2019-07-11
- **/
+import com.netflix.loadbalancer.AbstractServerList;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.IRule;
+import com.netflix.loadbalancer.Server;
+
 @Configuration
 public class ServiceCombRibbonClientConfiguration {
   @Bean
   @ConditionalOnMissingBean
-  public ServerList<?> ribbonServerList(IClientConfig config, DiscoveryClient discoveryClient,
+  public ILoadBalancer ribbonLoadBalancer(
+      IRule rule, AbstractServerList<Server> serverList) {
+    return new ServiceCombLoadBalancer(rule, serverList);
+  }
+
+  @Bean
+  @ConditionalOnMissingBean
+  public AbstractServerList<Server> ribbonServerList(IClientConfig config, DiscoveryClient discoveryClient,
       ServiceCombRegistration serviceCombRegistration) {
     ServiceCombServerList serverList = new ServiceCombServerList(discoveryClient, serviceCombRegistration);
     serverList.initWithNiwsConfig(config);
     return serverList;
   }
 
   @Bean
-  @ConditionalOnProperty(value = "spring.cloud.servicecomb.discovery.ping")
-  public IPing ping() {
-    return new ServiceCombIPing();
-  }
-
-  @Bean
-  public ServerListUpdater serviceCombServerListUpdater() {
-    return new ServiceCombServerListUpdater();
+  @ConditionalOnMissingBean
+  public IRule ribbonRule() {
+    return new ServiceCombRoundRobinRule();
   }
 }

spring-cloud-huawei-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/ribbon/ServiceCombRibbonClientConfiguration.java

@@ -0,0 +1,53 @@
+/*
+
+ * Copyright (C) 2020-2022 Huawei Technologies Co., Ltd. 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
+ *
+ *     http://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 com.huaweicloud.servicecomb.discovery.ribbon;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.springframework.util.CollectionUtils;
+
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.IRule;
+import com.netflix.loadbalancer.Server;
+
+public class ServiceCombRoundRobinRule implements IRule {
+  private final AtomicInteger counter = new AtomicInteger(0);
+
+  private ILoadBalancer loadBalancer;
+
+  @Override
+  public Server choose(Object key) {
+    List<Server> servers = loadBalancer.getReachableServers();
+    if (CollectionUtils.isEmpty(servers)) {
+      return null;
+    }
+    int index = Math.abs(counter.getAndIncrement()) % servers.size();
+    return servers.get(index);
+  }
+
+  @Override
+  public void setLoadBalancer(ILoadBalancer lb) {
+    this.loadBalancer = lb;
+  }
+
+  @Override
+  public ILoadBalancer getLoadBalancer() {
+    return this.loadBalancer;
+  }
+}