From a0a4bb050797ac729985841cf44a67a2d70ae054 Mon Sep 17 00:00:00 2001
From: cdfive <176402936@qq.com>
Date: Wed, 29 May 2019 12:38:27 +0800
Subject: [PATCH] Fix error comment and add note comment for checking
 dataSource.

---
 .../sentinel/endpoint/SentinelHealthIndicator.java    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java
index 765a39096..8ca863ab7 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java
@@ -37,10 +37,10 @@ import java.util.Map;
  *
  * <p>
  * Check the status of Sentinel Dashboard by sending a heartbeat message to it.
- * If no Exception thrown, it's OK.
+ * If return true, it's OK.
  *
  * Check the status of Sentinel DataSource by calling loadConfig method of {@link AbstractDataSource}.
- * If return true, it's OK.
+ * If no Exception thrown, it's OK.
  *
  * If Dashboard and DataSource are both OK, the health status is UP.
  *</p>
@@ -82,7 +82,7 @@ public class SentinelHealthIndicator extends AbstractHealthIndicator {
         boolean dashboardUp = true;
         String consoleServer = TransportConfig.getConsoleServer();
         if (StringUtils.isEmpty(consoleServer)) {
-            // If Dashboard isn't configured, mark the status of Dashboard with UNKNOWN and the dashboardUp is still true
+            // If Dashboard isn't configured, it's OK and mark the status of Dashboard with UNKNOWN.
             detailMap.put("dashboard", new Status(Status.UNKNOWN.getCode(), "dashboard isn't configured"));
         } else {
             // If Dashboard is configured, send a heartbeat message to it and check the result
@@ -103,6 +103,11 @@ public class SentinelHealthIndicator extends AbstractHealthIndicator {
         detailMap.put("dataSource", dataSourceDetailMap);
 
         // Get all DataSources and each call loadConfig to check if it's OK
+        // If no Exception thrown, it's OK
+        // Note:
+        // Even if the dynamic config center is down, the loadConfig() might return successfully
+        // e.g. for Nacos client, it might retrieve from the local cache)
+        // But in most circumstances it's okay
         Map<String, AbstractDataSource> dataSourceMap = beanFactory.getBeansOfType(AbstractDataSource.class);
         for (Map.Entry<String, AbstractDataSource> dataSourceMapEntry : dataSourceMap.entrySet()) {
             String dataSourceBeanName = dataSourceMapEntry.getKey();