Fix extension healthcheck bug (#697)

* Fix extension healthcheck bug (#694)

Author: HzjNeverStop

sofa-boot-project/sofa-boot-autoconfigure/src/test/java/com/alipay/sofa/autoconfigure/test/runtime/SofaRuntimePropertiesTest.java

@@ -38,7 +38,8 @@
 @RunWith(SpringRunner.class)
 @TestPropertySource(properties = { "com.alipay.sofa.boot.disableJvmFirst=true",
                                   "com.alipay.sofa.boot.skipJvmReferenceHealthCheck=true",
-                                  "com.alipay.sofa.boot.skipJvmSerialize=true", })
+                                  "com.alipay.sofa.boot.skipJvmSerialize=true",
+                                  "com.alipay.sofa.boot.skipExtensionHealthCheck=true" })
 public class SofaRuntimePropertiesTest {
 
     @Autowired
@@ -72,6 +73,15 @@ public void testSkipJvmSerializeProperty() {
         Assert.assertTrue(configurationProperties.isSkipJvmSerialize());
     }
 
+    @Test
+    public void testSkipExtensionHealthCheckProperty() {
+        SofaRuntimeConfigurationProperties configurationProperties = ctx
+            .getBean(SofaRuntimeConfigurationProperties.class);
+
+        Assert.assertTrue(SofaRuntimeProperties.isSkipExtensionHealthCheck(ctx.getClassLoader()));
+        Assert.assertTrue(configurationProperties.isSkipExtensionHealthCheck());
+    }
+
     @Configuration
     @EnableAutoConfiguration
     static class SofaRuntimePropertiesTestConfiguration {

sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/main/java/com/alipay/sofa/runtime/SofaRuntimeProperties.java

@@ -27,8 +27,8 @@
 public class SofaRuntimeProperties {
 
     private static ConcurrentHashMap<ClassLoader, Boolean> skipJvmReferenceHealthCheckMap = new ConcurrentHashMap<>();
+    private static ConcurrentHashMap<ClassLoader, Boolean> skipExtensionHealthCheckMap    = new ConcurrentHashMap<>();
     private static ConcurrentHashMap<ClassLoader, Boolean> disableJvmFirstMap             = new ConcurrentHashMap<>();
-
     private static ConcurrentHashMap<ClassLoader, Boolean> skipJvmSerializeMap            = new ConcurrentHashMap<>();
 
     public static boolean isSkipJvmReferenceHealthCheck(SofaRuntimeContext sofaRuntimeContext) {
@@ -45,6 +45,20 @@ public static void setSkipJvmReferenceHealthCheck(ClassLoader classLoader,
         skipJvmReferenceHealthCheckMap.putIfAbsent(classLoader, skipJvmReferenceHealthCheck);
     }
 
+    public static boolean isSkipExtensionHealthCheck(SofaRuntimeContext sofaRuntimeContext) {
+        return isSkipExtensionHealthCheck(sofaRuntimeContext.getAppClassLoader());
+    }
+
+    public static boolean isSkipExtensionHealthCheck(ClassLoader classLoader) {
+        return skipExtensionHealthCheckMap.get(classLoader) != null
+               && skipExtensionHealthCheckMap.get(classLoader);
+    }
+
+    public static void setSkipExtensionHealthCheck(ClassLoader classLoader,
+                                                   boolean skipExtensionHealthCheck) {
+        skipExtensionHealthCheckMap.putIfAbsent(classLoader, skipExtensionHealthCheck);
+    }
+
     public static boolean isDisableJvmFirst(SofaRuntimeContext sofaRuntimeContext) {
         return isDisableJvmFirst(sofaRuntimeContext.getAppClassLoader());
     }

sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/main/java/com/alipay/sofa/runtime/configure/SofaRuntimeConfigurationProperties.java

@@ -53,4 +53,14 @@ public void setSkipJvmSerialize(boolean skipJvmSerialize) {
     public boolean isSkipJvmSerialize() {
         return SofaRuntimeProperties.isSkipJvmSerialize(this.getClass().getClassLoader());
     }
+
+    public void setSkipExtensionHealthCheck(boolean skipExtensionHealthCheck) {
+        SofaRuntimeProperties.setSkipExtensionHealthCheck(this.getClass().getClassLoader(),
+            skipExtensionHealthCheck);
+    }
+
+    public boolean isSkipExtensionHealthCheck() {
+        return SofaRuntimeProperties.isSkipExtensionHealthCheck(this.getClass().getClassLoader());
+    }
+
 }

sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/main/java/com/alipay/sofa/runtime/ext/component/ExtensionComponent.java

@@ -19,6 +19,7 @@
 import java.lang.reflect.Method;
 import java.util.Map;
 
+import com.alipay.sofa.runtime.SofaRuntimeProperties;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 
@@ -125,9 +126,12 @@ public void activate() throws ServiceRuntimeException {
 
     @Override
     public HealthResult isHealthy() {
-        HealthResult healthResult = new HealthResult(componentName.getRawName());
-        healthResult.setHealthy(true);
-        return healthResult;
+        if (SofaRuntimeProperties.isSkipExtensionHealthCheck(sofaRuntimeContext)) {
+            HealthResult healthResult = new HealthResult(componentName.getRawName());
+            healthResult.setHealthy(true);
+            return healthResult;
+        }
+        return super.isHealthy();
     }
 
     public Extension getExtension() {

sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaEventHandlerTest.java

@@ -75,6 +75,7 @@ public void before() {
         Properties properties = new Properties();
         properties.setProperty("com.alipay.sofa.boot.disableJvmFirst", "true");
         properties.setProperty("com.alipay.sofa.boot.skipJvmReferenceHealthCheck", "true");
+        properties.setProperty("com.alipay.sofa.boot.skipExtensionHealthCheck", "true");
         properties.setProperty("com.alipay.sofa.boot.skipJvmSerialize", "true");
         properties.setProperty("spring.application.name", "tSofaEventHandlerTest");
         SofaFramework.getRuntimeSet().forEach(value -> SofaFramework.unRegisterSofaRuntimeManager(value));
@@ -102,6 +103,7 @@ public void testUninstallEvent() {
         Assert.assertFalse(SofaRuntimeProperties.isDisableJvmFirst(ctx.getClassLoader()));
         Assert
             .assertFalse(SofaRuntimeProperties.isSkipJvmReferenceHealthCheck(ctx.getClassLoader()));
+        Assert.assertFalse(SofaRuntimeProperties.isSkipExtensionHealthCheck(ctx.getClassLoader()));
         Assert.assertFalse(SofaRuntimeProperties.isSkipJvmSerialize(ctx.getClassLoader()));
         Assert.assertTrue(SofaFramework.getRuntimeSet().isEmpty());
         Assert.assertFalse(ctx.isActive());