Submit a feature that applies graceful up and down

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

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

foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DataCenterProperties.java

@@ -19,11 +19,11 @@
 public class DataCenterProperties {
   public static final String PREFIX = "servicecomb.datacenter";
 
-  private String name;
+  private String name = "local";
 
-  private String region;
+  private String region = "local";
 
-  private String availableZone;
+  private String availableZone = "local";
 
   public String getName() {
     return name;

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

@@ -183,7 +183,7 @@ private VersionedCache calcAvailableInstance(String application, String serviceN
         continue;
       }
       if (instance.getHistoryStatus() == HistoryStatus.HISTORY
-          && instance.getMicroserviceInstanceStatus() == MicroserviceInstanceStatus.UP
+          && instance.getStatus() == MicroserviceInstanceStatus.UP
           && instance.getPingStatus() == PingStatus.OK
           && instance.getIsolationStatus() == IsolationStatus.NORMAL) {
         result.add(instance);

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

@@ -93,4 +93,10 @@ public interface MicroserviceInstance {
   default String getServiceId() {
     return "";
   }
+
+  /**
+   * Service status(Required): status of this microservice.
+   *
+   */
+  MicroserviceInstanceStatus getStatus();
 }

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

@@ -24,7 +24,7 @@
 /**
  * This is the core service registration interface. <br/>
  */
-public interface Registration<R extends RegistrationInstance> extends SPIEnabled, SPIOrder, LifeCycle {
+public interface Registration<R extends MicroserviceInstance> extends SPIEnabled, SPIOrder, LifeCycle {
   String name();
 
   /**

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

@@ -69,21 +69,21 @@ public void init(DiscoveryContext context, DiscoveryTreeNode parent) {
 
     for (StatefulDiscoveryInstance instance : instances) {
       if (HistoryStatus.CURRENT == instance.getHistoryStatus() &&
-          MicroserviceInstanceStatus.UP == instance.getMicroserviceInstanceStatus() &&
+          MicroserviceInstanceStatus.UP == instance.getStatus() &&
           PingStatus.OK == instance.getPingStatus() &&
           IsolationStatus.NORMAL == instance.getIsolationStatus()) {
         level0.add(instance);
         continue;
       }
       if (HistoryStatus.CURRENT == instance.getHistoryStatus() &&
-          MicroserviceInstanceStatus.UP == instance.getMicroserviceInstanceStatus() &&
+          MicroserviceInstanceStatus.UP == instance.getStatus() &&
           PingStatus.UNKNOWN == instance.getPingStatus() &&
           IsolationStatus.NORMAL == instance.getIsolationStatus()) {
         level1.add(instance);
         continue;
       }
       if (HistoryStatus.HISTORY == instance.getHistoryStatus() &&
-          MicroserviceInstanceStatus.UP == instance.getMicroserviceInstanceStatus() &&
+          MicroserviceInstanceStatus.UP == instance.getStatus() &&
           PingStatus.OK == instance.getPingStatus() &&
           IsolationStatus.NORMAL == instance.getIsolationStatus()) {
         level2.add(instance);

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

@@ -46,8 +46,6 @@ public enum HistoryStatus {
 
   private final DiscoveryInstance discoveryInstance;
 
-  private MicroserviceInstanceStatus microserviceInstanceStatus = MicroserviceInstanceStatus.UP;
-
   private IsolationStatus isolationStatus = IsolationStatus.NORMAL;
 
   private long isolatedTime;
@@ -64,15 +62,6 @@ public StatefulDiscoveryInstance(DiscoveryInstance discoveryInstance) {
     this.discoveryInstance = discoveryInstance;
   }
 
-  public MicroserviceInstanceStatus getMicroserviceInstanceStatus() {
-    return microserviceInstanceStatus;
-  }
-
-  public void setMicroserviceInstanceStatus(
-      MicroserviceInstanceStatus microserviceInstanceStatus) {
-    this.microserviceInstanceStatus = microserviceInstanceStatus;
-  }
-
   public IsolationStatus getIsolationStatus() {
     return isolationStatus;
   }

foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestInstanceStatusDiscoveryFilter.java

@@ -36,22 +36,22 @@ public void test_all_group_correct_init() {
     List<StatefulDiscoveryInstance> instances = new ArrayList<>();
     StatefulDiscoveryInstance instance1 = Mockito.mock(StatefulDiscoveryInstance.class);
     Mockito.when(instance1.getHistoryStatus()).thenReturn(HistoryStatus.CURRENT);
-    Mockito.when(instance1.getMicroserviceInstanceStatus()).thenReturn(MicroserviceInstanceStatus.UP);
+    Mockito.when(instance1.getStatus()).thenReturn(MicroserviceInstanceStatus.UP);
     Mockito.when(instance1.getPingStatus()).thenReturn(PingStatus.OK);
     Mockito.when(instance1.getIsolationStatus()).thenReturn(IsolationStatus.NORMAL);
     StatefulDiscoveryInstance instance2 = Mockito.mock(StatefulDiscoveryInstance.class);
     Mockito.when(instance2.getHistoryStatus()).thenReturn(HistoryStatus.CURRENT);
-    Mockito.when(instance2.getMicroserviceInstanceStatus()).thenReturn(MicroserviceInstanceStatus.UP);
+    Mockito.when(instance2.getStatus()).thenReturn(MicroserviceInstanceStatus.UP);
     Mockito.when(instance2.getPingStatus()).thenReturn(PingStatus.UNKNOWN);
     Mockito.when(instance2.getIsolationStatus()).thenReturn(IsolationStatus.NORMAL);
     StatefulDiscoveryInstance instance3 = Mockito.mock(StatefulDiscoveryInstance.class);
     Mockito.when(instance3.getHistoryStatus()).thenReturn(HistoryStatus.HISTORY);
-    Mockito.when(instance3.getMicroserviceInstanceStatus()).thenReturn(MicroserviceInstanceStatus.UP);
+    Mockito.when(instance3.getStatus()).thenReturn(MicroserviceInstanceStatus.UP);
     Mockito.when(instance3.getPingStatus()).thenReturn(PingStatus.OK);
     Mockito.when(instance3.getIsolationStatus()).thenReturn(IsolationStatus.NORMAL);
     StatefulDiscoveryInstance instance4 = Mockito.mock(StatefulDiscoveryInstance.class);
     Mockito.when(instance4.getHistoryStatus()).thenReturn(HistoryStatus.CURRENT);
-    Mockito.when(instance4.getMicroserviceInstanceStatus()).thenReturn(MicroserviceInstanceStatus.UP);
+    Mockito.when(instance4.getStatus()).thenReturn(MicroserviceInstanceStatus.UP);
     Mockito.when(instance4.getPingStatus()).thenReturn(PingStatus.FAIL);
     Mockito.when(instance4.getIsolationStatus()).thenReturn(IsolationStatus.NORMAL);
     instances.addAll(Arrays.asList(instance1, instance2, instance3, instance4));

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

@@ -19,6 +19,7 @@
 
 import org.apache.servicecomb.registry.api.DataCenterInfo;
 import org.apache.servicecomb.registry.api.MicroserviceInstance;
+import org.apache.servicecomb.registry.api.MicroserviceInstanceStatus;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -188,4 +189,9 @@ public String getInstanceId() {
   public String getServiceId() {
     return serviceId;
   }
+
+  @Override
+  public MicroserviceInstanceStatus getStatus() {
+    return MicroserviceInstanceStatus.UP;
+  }
 }

service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/EtcdInstance.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 EtcdInstance implements MicroserviceInstance {
   private String serviceId;
@@ -188,6 +189,11 @@ public String getServiceId() {
     return serviceId;
   }
 
+  @Override
+  public MicroserviceInstanceStatus getStatus() {
+    return MicroserviceInstanceStatus.UP;
+  }
+
   @Override
   public String toString() {
     return "EtcdInstance{" +

service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalRegistrationInstance.java

@@ -118,6 +118,11 @@ public String getInstanceId() {
     return this.instanceId;
   }
 
+  @Override
+  public MicroserviceInstanceStatus getStatus() {
+    return MicroserviceInstanceStatus.UP;
+  }
+
   @Override
   public MicroserviceInstanceStatus getInitialStatus() {
     return MicroserviceInstanceStatus.STARTING;

service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosConst.java

@@ -57,4 +57,6 @@ public class NacosConst {
   public static final String NAMING_LOAD_CACHE_AT_START = "namingLoadCacheAtStart";
 
   public static final String NACOS_REGISTRY_NAME = "nacos-registry";
+
+  public static final String NACOS_STATUS= "nacos-status";
 }

service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosDiscoveryInstance.java

@@ -57,7 +57,15 @@ public NacosDiscoveryInstance(Instance instance, String application, String serv
 
   @Override
   public MicroserviceInstanceStatus getStatus() {
-    return instance.isEnabled() ? MicroserviceInstanceStatus.UP : MicroserviceInstanceStatus.DOWN;
+    if (instance.isEnabled()) {
+      String instanceStatus = instance.getMetadata().get(NacosConst.NACOS_STATUS);
+      if (StringUtils.isBlank(instanceStatus)) {
+        return MicroserviceInstanceStatus.UP;
+      }
+      return MicroserviceInstanceStatus.valueOf(instanceStatus);
+    } else {
+      return MicroserviceInstanceStatus.DOWN;
+    }
   }
 
   @Override

service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosDiscoveryProperties.java

@@ -49,6 +49,8 @@ public class NacosDiscoveryProperties {
 
   private boolean enableSwaggerRegistration = false;
 
+  private String initialStatus = "UP";
+
   public String getServerAddr() {
     return serverAddr;
   }
@@ -160,4 +162,12 @@ public boolean isEnableSwaggerRegistration() {
   public void setEnableSwaggerRegistration(boolean enableSwaggerRegistration) {
     this.enableSwaggerRegistration = enableSwaggerRegistration;
   }
+
+  public String getInitialStatus() {
+    return initialStatus;
+  }
+
+  public void setInitialStatus(String initialStatus) {
+    this.initialStatus = initialStatus;
+  }
 }

service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosMicroserviceHandler.java

@@ -63,6 +63,7 @@ public static Instance createMicroserviceInstance(
     metadata.put(NacosConst.PROPERTY_DATACENTER, dataCenterProperties.getName());
     metadata.put(NacosConst.PROPERTY_REGION, dataCenterProperties.getRegion());
     metadata.put(NacosConst.PROPERTY_ZONE, dataCenterProperties.getAvailableZone());
+    metadata.put(NacosConst.NACOS_STATUS, properties.getInitialStatus());
     if (!StringUtils.isEmpty(environment.getProperty(VERSION_MAPPING)) &&
         !StringUtils.isEmpty(environment.getProperty(environment.getProperty(VERSION_MAPPING)))) {
       metadata.put("version", environment.getProperty(environment.getProperty(VERSION_MAPPING)));

service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosRegistration.java

@@ -132,9 +132,20 @@ public NacosRegistrationInstance getMicroserviceInstance() {
 
   @Override
   public boolean updateMicroserviceInstanceStatus(MicroserviceInstanceStatus status) {
-    // Do not support Nacos update status now. Because update status will fail
-    // due to some unknown reasons(Maybe different constrains in register and maintain api).
-    return true;
+    try {
+      if (MicroserviceInstanceStatus.DOWN == status) {
+        instance.getMetadata().put(NacosConst.NACOS_STATUS, MicroserviceInstanceStatus.DOWN.name());
+        namingService.deregisterInstance(nacosRegistrationInstance.getServiceName(),
+            nacosRegistrationInstance.getApplication(), instance);
+      } else {
+        instance.getMetadata().put(NacosConst.NACOS_STATUS, status.name());
+        namingService.registerInstance(nacosRegistrationInstance.getServiceName(),
+            nacosRegistrationInstance.getApplication(), instance);
+      }
+      return true;
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
   }
 
   @Override

service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosRegistrationInstance.java

@@ -103,6 +103,11 @@ public String getInstanceId() {
     return instance.getInstanceId();
   }
 
+  @Override
+  public MicroserviceInstanceStatus getStatus() {
+    return MicroserviceInstanceStatus.valueOf(instance.getMetadata().get(NacosConst.NACOS_STATUS));
+  }
+
   @Override
   public MicroserviceInstanceStatus getInitialStatus() {
     return MicroserviceInstanceStatus.STARTING;

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

@@ -49,7 +49,7 @@ public class SCConfigurationProperties {
 
   private boolean autoDiscovery = false;
 
-  private String initialStatus = "STARTING";
+  private String initialStatus = "UP";
 
   private boolean watch = false;
 

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

@@ -76,9 +76,9 @@ public String getVersion() {
 
   @Override
   public DataCenterInfo getDataCenterInfo() {
-    return new DataCenterInfo(microserviceInstance.getDataCenterInfo().getName(),
-        microserviceInstance.getDataCenterInfo().getRegion(),
-        microserviceInstance.getDataCenterInfo().getAvailableZone());
+      return new DataCenterInfo(microserviceInstance.getDataCenterInfo().getName(),
+              microserviceInstance.getDataCenterInfo().getRegion(),
+              microserviceInstance.getDataCenterInfo().getAvailableZone());
   }
 
   @Override

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

@@ -34,8 +34,7 @@ public class SCRegistrationInstance implements RegistrationInstance {
 
   private final ServiceCenterRegistration serviceCenterRegistration;
 
-  public SCRegistrationInstance(Microservice microservice,
-      MicroserviceInstance microserviceInstance,
+  public SCRegistrationInstance(Microservice microservice, MicroserviceInstance microserviceInstance,
       ServiceCenterRegistration serviceCenterRegistration) {
     this.microservice = microservice;
     this.microserviceInstance = microserviceInstance;
@@ -106,6 +105,11 @@ public String getServiceId() {
     return microservice.getServiceId();
   }
 
+  @Override
+  public MicroserviceInstanceStatus getStatus() {
+    return MicroserviceInstanceStatus.valueOf(microserviceInstance.getStatus().name());
+  }
+
   @Override
   public MicroserviceInstanceStatus getInitialStatus() {
     return MicroserviceInstanceStatus.valueOf(microserviceInstance.getStatus().name());

service-registry/registry-zero-config/src/main/java/org/apache/servicecomb/zeroconfig/ZeroConfigRegistrationInstance.java

@@ -86,6 +86,11 @@ public String getInstanceId() {
     return this.self.getInstanceId();
   }
 
+  @Override
+  public MicroserviceInstanceStatus getStatus() {
+    return MicroserviceInstanceStatus.UP;
+  }
+
   @Override
   public MicroserviceInstanceStatus getInitialStatus() {
     return MicroserviceInstanceStatus.STARTING;

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

@@ -24,11 +24,6 @@ public ZookeeperDiscoveryInstance(ZookeeperInstance other) {
     super(other);
   }
 
-  @Override
-  public MicroserviceInstanceStatus getStatus() {
-    return MicroserviceInstanceStatus.UP;
-  }
-
   @Override
   public String getRegistryName() {
     return ZookeeperConst.ZOOKEEPER_REGISTRY_NAME;

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) {
@@ -116,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;
@@ -187,4 +196,9 @@ public String getInstanceId() {
   public String getServiceId() {
     return serviceId;
   }
+
+  @Override
+  public MicroserviceInstanceStatus getStatus() {
+    return this.status;
+  }
 }