study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Fix error comment and add note comment for checking dataSource.

Browse Source
This commit is contained in:
cdfive 2019-05-29 12:38:27 +08:00
parent 584d5f4107
commit a0a4bb0507
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java
View File

@ -37,10 +37,10 @@ import java.util.Map;
* *
* <p> * <p>
* Check the status of Sentinel Dashboard by sending a heartbeat message to it. * 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}. * 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. * If Dashboard and DataSource are both OK, the health status is UP.
*</p> *</p>
@ -82,7 +82,7 @@ public class SentinelHealthIndicator extends AbstractHealthIndicator {
boolean dashboardUp = true; boolean dashboardUp = true;
String consoleServer = TransportConfig.getConsoleServer(); String consoleServer = TransportConfig.getConsoleServer();
if (StringUtils.isEmpty(consoleServer)) { 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")); detailMap.put("dashboard", new Status(Status.UNKNOWN.getCode(), "dashboard isn't configured"));
} else { } else {
// If Dashboard is configured, send a heartbeat message to it and check the result // 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); detailMap.put("dataSource", dataSourceDetailMap);
// Get all DataSources and each call loadConfig to check if it's OK // 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); Map<String, AbstractDataSource> dataSourceMap = beanFactory.getBeansOfType(AbstractDataSource.class);
for (Map.Entry<String, AbstractDataSource> dataSourceMapEntry : dataSourceMap.entrySet()) { for (Map.Entry<String, AbstractDataSource> dataSourceMapEntry : dataSourceMap.entrySet()) {
String dataSourceBeanName = dataSourceMapEntry.getKey(); String dataSourceBeanName = dataSourceMapEntry.getKey();