elegant up or dwon for etcd/consul (#4679)

Author: chenshouye168

service-registry/registry-consul/src/main/java/org/apache/servicecomb/registry/consul/ConsulDiscoveryInstance.java

@@ -18,19 +18,13 @@
 package org.apache.servicecomb.registry.consul;
 
 import org.apache.servicecomb.registry.api.DiscoveryInstance;
-import org.apache.servicecomb.registry.api.MicroserviceInstanceStatus;
 
 public class ConsulDiscoveryInstance extends ConsulInstance implements DiscoveryInstance {
 
   public ConsulDiscoveryInstance(ConsulInstance consulInstance) {
     super(consulInstance);
   }
 
-  @Override
-  public MicroserviceInstanceStatus getStatus() {
-    return MicroserviceInstanceStatus.UP;
-  }
-
   @Override
   public String getRegistryName() {
     return ConsulConst.CONSUL_REGISTRY_NAME;

service-registry/registry-consul/src/main/java/org/apache/servicecomb/registry/consul/ConsulInstance.java

@@ -51,6 +51,8 @@ public class ConsulInstance implements MicroserviceInstance {
 
   private Map<String, String> properties = new HashMap<>();
 
+  private MicroserviceInstanceStatus status;
+
   public ConsulInstance() {
 
   }
@@ -68,6 +70,7 @@ public ConsulInstance(ConsulInstance other) {
     this.endpoints = other.endpoints;
     this.schemas = other.schemas;
     this.properties = other.properties;
+    this.status = other.status;
   }
 
   public void setServiceId(String serviceId) {
@@ -118,6 +121,10 @@ public void setProperties(Map<String, String> properties) {
     this.properties = properties;
   }
 
+  public void setStatus(MicroserviceInstanceStatus status) {
+    this.status = status;
+  }
+
   @Override
   public String getEnvironment() {
     return this.environment;
@@ -192,6 +199,6 @@ public String getServiceId() {
 
   @Override
   public MicroserviceInstanceStatus getStatus() {
-    return MicroserviceInstanceStatus.UP;
+    return this.status;
   }
 }

service-registry/registry-consul/src/main/java/org/apache/servicecomb/registry/consul/ConsulRegistration.java

@@ -71,6 +71,8 @@ public class ConsulRegistration implements Registration<ConsulRegistrationInstan
   @Value("${servicecomb.rest.address:127.0.0.1:8080}")
   private String restAddress;
 
+  private ImmutableRegistration.Builder registrationBuilder;
+
   @Override
   public String name() {
     return ConsulConst.CONSUL_REGISTRY_NAME;
@@ -83,6 +85,14 @@ public ConsulRegistrationInstance getMicroserviceInstance() {
 
   @Override
   public boolean updateMicroserviceInstanceStatus(MicroserviceInstanceStatus status) {
+    consulInstance.setStatus(status);
+    Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+    Map<String, String> meta = new HashMap<>();
+    meta.put("meta", gson.toJson(consulInstance));
+    registrationBuilder.meta(meta);
+    ImmutableRegistration newService = registrationBuilder.build();
+    AgentClient agentClient = consulClient.agentClient();
+    agentClient.register(newService);
     return true;
   }
 
@@ -132,12 +142,14 @@ public void init() {
     }
     consulInstance.setProperties(BootStrapProperties.readServiceProperties(environment));
     consulInstance.setVersion(BootStrapProperties.readServiceVersion(environment));
+    consulInstance.setStatus(
+        MicroserviceInstanceStatus.valueOf(BootStrapProperties.readServiceInstanceInitialStatus(environment)));
   }
 
   @Override
   public void run() {
     LOGGER.info("ConsulRegistration run");
-    ImmutableRegistration.Builder registrationBuilder = ImmutableRegistration.builder()
+    registrationBuilder = ImmutableRegistration.builder()
         .name(consulInstance.getServiceName());
     List<String> endpoints = consulInstance.getEndpoints();
     for (String endpoint : endpoints) {

service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/EtcdDiscoveryInstance.java

@@ -17,19 +17,12 @@
 package org.apache.servicecomb.registry.etcd;
 
 import org.apache.servicecomb.registry.api.DiscoveryInstance;
-import org.apache.servicecomb.registry.api.MicroserviceInstanceStatus;
-
 public class EtcdDiscoveryInstance extends EtcdInstance implements DiscoveryInstance {
 
   public EtcdDiscoveryInstance(EtcdInstance other) {
     super(other);
   }
 
-  @Override
-  public MicroserviceInstanceStatus getStatus() {
-    return MicroserviceInstanceStatus.UP;
-  }
-
   @Override
   public String getRegistryName() {
     return EtcdConst.ETCD_REGISTRY_NAME;

service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/EtcdInstance.java

@@ -50,6 +50,8 @@ public class EtcdInstance implements MicroserviceInstance {
 
   private Map<String, String> properties = new HashMap<>();
 
+  private MicroserviceInstanceStatus status;
+
   public EtcdInstance() {
 
   }
@@ -67,6 +69,7 @@ public EtcdInstance(EtcdInstance other) {
     this.endpoints = other.endpoints;
     this.schemas = other.schemas;
     this.properties = other.properties;
+    this.status = other.status;
   }
 
   public void setServiceId(String serviceId) {
@@ -117,6 +120,10 @@ public void setProperties(Map<String, String> properties) {
     this.properties = properties;
   }
 
+  public void setStatus(MicroserviceInstanceStatus status) {
+    this.status = status;
+  }
+
   @Override
   public String getEnvironment() {
     return this.environment;
@@ -191,7 +198,7 @@ public String getServiceId() {
 
   @Override
   public MicroserviceInstanceStatus getStatus() {
-    return MicroserviceInstanceStatus.UP;
+    return this.status;
   }
 
   @Override

service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/EtcdRegistration.java

@@ -98,6 +98,11 @@ public EtcdRegistrationInstance getMicroserviceInstance() {
 
   @Override
   public boolean updateMicroserviceInstanceStatus(MicroserviceInstanceStatus status) {
+    this.etcdInstance.setStatus(status);
+    String valueJson = MuteExceptionUtil.builder().withLog("to json, key:{}, value:{}", keyPath, etcdInstance)
+        .executeFunction(JsonUtils::writeValueAsString, etcdInstance);
+    register(ByteSequence.from(keyPath, Charset.defaultCharset()),
+        ByteSequence.from(valueJson, Charset.defaultCharset()));
     return true;
   }
 
@@ -146,6 +151,8 @@ public void init() {
     }
     etcdInstance.setProperties(BootStrapProperties.readServiceProperties(environment));
     etcdInstance.setVersion(BootStrapProperties.readServiceVersion(environment));
+    etcdInstance.setStatus(
+        MicroserviceInstanceStatus.valueOf(BootStrapProperties.readServiceInstanceInitialStatus(environment)));
   }
 
   @Override