Submit a feature that applies graceful up and down

core/src/main/java/org/apache/servicecomb/core/SCBEngine.java

@@ -371,7 +371,7 @@ private void doRun() throws Exception {
     registrationManager.run();
     discoveryManager.run();
     // ensure can invoke services in AFTER_REGISTRY
-    registrationManager.updateMicroserviceInstanceStatus(MicroserviceInstanceStatus.UP);
+//    registrationManager.updateMicroserviceInstanceStatus(MicroserviceInstanceStatus.UP);
     status = SCBStatus.UP;
     triggerEvent(EventType.AFTER_REGISTRY);
 

foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java

@@ -178,7 +178,8 @@ private VersionedCache calcAvailableInstance(String application, String serviceN
         -> new ConcurrentHashMapEx<>());
     List<StatefulDiscoveryInstance> result = new ArrayList<>();
     for (StatefulDiscoveryInstance instance : statefulInstances.values()) {
-      if (instance.getHistoryStatus() == HistoryStatus.CURRENT) {
+      if (instance.getHistoryStatus() == HistoryStatus.CURRENT
+              && instance.getMicroserviceInstanceStatus() == MicroserviceInstanceStatus.UP) {
         result.add(instance);
         continue;
       }

foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/StatefulDiscoveryInstance.java

@@ -62,6 +62,7 @@ public enum HistoryStatus {
 
   public StatefulDiscoveryInstance(DiscoveryInstance discoveryInstance) {
     this.discoveryInstance = discoveryInstance;
+    this.microserviceInstanceStatus = discoveryInstance.getStatus();
   }
 
   public MicroserviceInstanceStatus getMicroserviceInstanceStatus() {

service-registry/registry-service-center/src/main/java/org/apache/servicecomb/registry/sc/MicroserviceHandler.java

@@ -142,7 +142,11 @@ public static MicroserviceInstance createMicroserviceInstance(
     properties.putAll(BootStrapProperties.readServiceProperties(environment));
     properties.putAll(genCasProperties(environment));
     microserviceInstance.setProperties(properties);
-    microserviceInstance.setStatus(MicroserviceInstanceStatus.valueOf(scConfigurationProperties.getInitialStatus()));
+    if (scConfigurationProperties.isEnableElegantUpDown()){
+      microserviceInstance.setStatus(MicroserviceInstanceStatus.STARTING);
+    }else {
+      microserviceInstance.setStatus(MicroserviceInstanceStatus.UP);
+    }
     return microserviceInstance;
   }
 

service-registry/registry-service-center/src/main/java/org/apache/servicecomb/registry/sc/SCConfigurationProperties.java

@@ -28,6 +28,8 @@ public class SCConfigurationProperties {
 
   private boolean enableSwaggerRegistration = false;
 
+  private boolean enableElegantUpDown = false;
+
   /**
    * for registration service
    * when swagger is different between local with remote serviceCenter. if ignoreSwaggerDifferent is true.
@@ -171,4 +173,12 @@ public boolean isEnableSwaggerRegistration() {
   public void setEnableSwaggerRegistration(boolean enableSwaggerRegistration) {
     this.enableSwaggerRegistration = enableSwaggerRegistration;
   }
+
+  public boolean isEnableElegantUpDown() {
+    return enableElegantUpDown;
+  }
+
+  public void setEnableElegantUpDown(boolean enableElegantUpDown) {
+    this.enableElegantUpDown = enableElegantUpDown;
+  }
 }

service-registry/registry-service-center/src/main/java/org/apache/servicecomb/registry/sc/SCDiscoveryInstance.java

@@ -76,9 +76,13 @@ public String getVersion() {
 
   @Override
   public DataCenterInfo getDataCenterInfo() {
-    return new DataCenterInfo(microserviceInstance.getDataCenterInfo().getName(),
-        microserviceInstance.getDataCenterInfo().getRegion(),
-        microserviceInstance.getDataCenterInfo().getAvailableZone());
+    org.apache.servicecomb.service.center.client.model.DataCenterInfo dataCenterInfo = microserviceInstance.getDataCenterInfo();
+    if (dataCenterInfo != null) {
+      return new DataCenterInfo(microserviceInstance.getDataCenterInfo().getName(),
+              microserviceInstance.getDataCenterInfo().getRegion(),
+              microserviceInstance.getDataCenterInfo().getAvailableZone());
+    }
+    return new DataCenterInfo();
   }
 
   @Override

service-registry/registry-service-center/src/main/java/org/apache/servicecomb/registry/sc/SCRegistration.java

@@ -195,4 +195,10 @@ public Microservice getBackendMicroservice() {
   public MicroserviceInstance getBackendMicroserviceInstance() {
     return microserviceInstance;
   }
+  public MicroserviceInstance getLatestMicroserviceInstance() {
+    MicroserviceInstance latestInstance = serviceCenterClient.getMicroserviceInstance(microserviceInstance.getServiceId(),
+            microserviceInstance.getInstanceId());
+    microserviceInstance.setStatus(latestInstance.getStatus());
+    return latestInstance;
+  }
 }

service-registry/registry-zookeeper/src/main/java/org/apache/servicecomb/registry/zookeeper/ZookeeperDiscoveryInstance.java

@@ -26,7 +26,7 @@ public ZookeeperDiscoveryInstance(ZookeeperInstance other) {
 
   @Override
   public MicroserviceInstanceStatus getStatus() {
-    return MicroserviceInstanceStatus.UP;
+    return super.getStatus();
   }
 
   @Override

service-registry/registry-zookeeper/src/main/java/org/apache/servicecomb/registry/zookeeper/ZookeeperInstance.java

@@ -23,6 +23,7 @@
 
 import org.apache.servicecomb.registry.api.DataCenterInfo;
 import org.apache.servicecomb.registry.api.MicroserviceInstance;
+import org.apache.servicecomb.registry.api.MicroserviceInstanceStatus;
 
 public class ZookeeperInstance implements MicroserviceInstance {
   private String serviceId;
@@ -49,6 +50,8 @@ public class ZookeeperInstance implements MicroserviceInstance {
 
   private Map<String, String> properties = new HashMap<>();
 
+  private MicroserviceInstanceStatus status;
+
   public ZookeeperInstance() {
 
   }
@@ -66,6 +69,8 @@ public ZookeeperInstance(ZookeeperInstance other) {
     this.endpoints = other.endpoints;
     this.schemas = other.schemas;
     this.properties = other.properties;
+    this.status = other.status;
+
   }
 
   public void setServiceId(String serviceId) {
@@ -187,4 +192,12 @@ public String getInstanceId() {
   public String getServiceId() {
     return serviceId;
   }
+
+  public MicroserviceInstanceStatus getStatus() {
+    return status;
+  }
+
+  public void setStatus(MicroserviceInstanceStatus status) {
+    this.status = status;
+  }
 }

service-registry/registry-zookeeper/src/main/java/org/apache/servicecomb/registry/zookeeper/ZookeeperRegistration.java

@@ -79,6 +79,8 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
 
   private RegistrationId registrationId;
 
+  private ServiceDiscovery<ZookeeperInstance> dis;
+
   @Autowired
   @SuppressWarnings("unused")
   public void setEnvironment(Environment environment) {
@@ -125,6 +127,12 @@ public void init() {
     }
     zookeeperInstance.setProperties(BootStrapProperties.readServiceProperties(environment));
     zookeeperInstance.setVersion(BootStrapProperties.readServiceVersion(environment));
+
+    if (zookeeperRegistryProperties.isEnableElegantUpDown()){
+      zookeeperInstance.setStatus(MicroserviceInstanceStatus.STARTING);
+    }else {
+      zookeeperInstance.setStatus(MicroserviceInstanceStatus.UP);
+    }
     try {
       this.instance = ServiceInstance.<ZookeeperInstance>builder().name(zookeeperInstance.getServiceName())
           .id(zookeeperInstance.getInstanceId()).payload(zookeeperInstance).build();
@@ -155,7 +163,7 @@ public void run() {
     client.start();
     JsonInstanceSerializer<ZookeeperInstance> serializer =
         new JsonInstanceSerializer<>(ZookeeperInstance.class);
-    ServiceDiscovery<ZookeeperInstance> dis = ServiceDiscoveryBuilder.builder(ZookeeperInstance.class)
+    dis = ServiceDiscoveryBuilder.builder(ZookeeperInstance.class)
         .client(client)
         .basePath(basePath + "/" + BootStrapProperties.readApplication(environment))
         .serializer(serializer)
@@ -187,8 +195,19 @@ public ZookeeperRegistrationInstance getMicroserviceInstance() {
 
   @Override
   public boolean updateMicroserviceInstanceStatus(MicroserviceInstanceStatus status) {
-    // not support yet
-    return true;
+      this.instance.getPayload().setStatus(status);
+      try {
+          if (status == MicroserviceInstanceStatus.UP){
+              dis.updateService(instance);
+          }
+          if (status == MicroserviceInstanceStatus.DOWN){
+              dis.registerService(instance);
+          }
+      } catch (Exception e){
+          throw new IllegalStateException(e);
+      }
+
+      return true;
   }
 
   @Override
@@ -212,4 +231,17 @@ public void addProperty(String key, String value) {
   public boolean enabled() {
     return zookeeperRegistryProperties.isEnabled();
   }
+
+  public ZookeeperInstance getZookeeperInstance(){
+    try {
+      ServiceInstance<ZookeeperInstance> zkInstance = dis.queryForInstance(instance.getName(), instance.getId());
+      if (zkInstance != null){
+        return zkInstance.getPayload();
+      }
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+    return null;
+  }
+
 }

service-registry/registry-zookeeper/src/main/java/org/apache/servicecomb/registry/zookeeper/ZookeeperRegistryProperties.java

@@ -33,6 +33,8 @@ public class ZookeeperRegistryProperties {
 
   private boolean enableSwaggerRegistration = false;
 
+  private boolean enableElegantUpDown = false;
+
   public boolean isEnabled() {
     return enabled;
   }
@@ -96,4 +98,12 @@ public String getAuthenticationInfo() {
   public void setAuthenticationInfo(String authenticationInfo) {
     this.authenticationInfo = authenticationInfo;
   }
+
+  public boolean isEnableElegantUpDown() {
+    return enableElegantUpDown;
+  }
+
+  public void setEnableElegantUpDown(boolean enableElegantUpDown) {
+    this.enableElegantUpDown = enableElegantUpDown;
+  }
 }