[huaweicloud#1276] Nacos registryHelthIndicator compatible graceful s…

…cenes microservice health check
chengyouling · May 24, 2024 · b191c5d · b191c5d
1 parent 97cd016
commit b191c5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...ery/src/main/java/com/huaweicloud/nacos/discovery/check/NacosRegistryHealthIndicator.java b/...ery/src/main/java/com/huaweicloud/nacos/discovery/check/NacosRegistryHealthIndicator.java
@@ -25,7 +25,7 @@
 import com.huaweicloud.nacos.discovery.registry.NacosServiceRegistrationEvent;
 
 public class NacosRegistryHealthIndicator implements HealthIndicator {
-  private boolean isSuccess = false;
+  private Boolean register;
 
   private static final String REGISTRATION_NOT_READY = "nacos registration not ready";
 
@@ -35,14 +35,14 @@ public NacosRegistryHealthIndicator() {
 
   @Override
   public Health health() {
-    if (isSuccess) {
+    if (register == null || register) {
       return Health.up().build();
     }
     return Health.down().withDetail("Error Message", REGISTRATION_NOT_READY).build();
   }
 
   @Subscribe
   public void registryListener(NacosServiceRegistrationEvent event) {
-    this.isSuccess = event.isSuccess();
+    this.register = event.isSuccess();
   }
 }
diff --git a/...main/java/com/huaweicloud/servicecomb/discovery/graceful/ServicecombGracefulEndpoint.java b/...main/java/com/huaweicloud/servicecomb/discovery/graceful/ServicecombGracefulEndpoint.java
@@ -20,6 +20,7 @@
 import javax.annotation.Nullable;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.servicecomb.service.center.client.model.MicroserviceInstanceStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
@@ -51,6 +52,8 @@ public void gracefulUpperAndDown(@Nullable String status) {
       LOGGER.warn("status input " + status + " is not a valid value.");
       return;
     }
+    serviceCombRegistration.getMicroserviceInstance()
+        .setStatus(MicroserviceInstanceStatus.valueOf(status.toUpperCase()));
     serviceCombServiceRegistry.setStatus(serviceCombRegistration, status.toUpperCase());
   }
 }