apache#7318, support disconnected data source (apache#8837)

* apache#7318, support disconnected data source * apache#7318, support disconnected data source
boomyamm · Dec 31, 2020 · 0cede36 · 0cede36
1 parent 6679b9a
commit 0cede36
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/...here-ha-common/src/main/java/org/apache/shardingsphere/ha/rule/biulder/HARuleBuilder.java b/...here-ha-common/src/main/java/org/apache/shardingsphere/ha/rule/biulder/HARuleBuilder.java
@@ -19,14 +19,17 @@
 
 import lombok.Setter;
 import org.apache.shardingsphere.ha.api.config.HARuleConfiguration;
+import org.apache.shardingsphere.ha.api.config.rule.HADataSourceRuleConfiguration;
 import org.apache.shardingsphere.ha.constant.HAOrder;
 import org.apache.shardingsphere.ha.rule.HARule;
 import org.apache.shardingsphere.infra.database.type.DatabaseType;
 import org.apache.shardingsphere.infra.rule.builder.ShardingSphereRuleBuilder;
 import org.apache.shardingsphere.infra.rule.builder.aware.ResourceAware;
 
 import javax.sql.DataSource;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * HA rule builder.
@@ -42,6 +45,12 @@ public final class HARuleBuilder implements ShardingSphereRuleBuilder<HARule, HA
 
     @Override
     public HARule build(final HARuleConfiguration ruleConfig) {
+        Set<String> dataSourceSet = new HashSet<>(128, 1);
+        for (HADataSourceRuleConfiguration each : ruleConfig.getDataSources()) {
+            dataSourceSet.add(each.getPrimaryDataSourceName());
+            dataSourceSet.addAll(each.getReplicaDataSourceNames());
+        }
+        dataSourceMap.entrySet().removeIf(stringDataSourceEntry -> !dataSourceSet.contains(stringDataSourceEntry.getKey()));
         return new HARule(ruleConfig, databaseType, dataSourceMap, schemaName);
     }
 

diff --git a/...-ha-common/src/test/java/org/apache/shardingsphere/ha/rule/biulder/HARuleBuilderTest.java b/...-ha-common/src/test/java/org/apache/shardingsphere/ha/rule/biulder/HARuleBuilderTest.java
@@ -17,15 +17,18 @@
 
 package org.apache.shardingsphere.ha.rule.biulder;
 
-import org.apache.shardingsphere.infra.rule.builder.ShardingSphereRuleBuilder;
-import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.infra.spi.ordered.OrderedSPIRegistry;
 import org.apache.shardingsphere.ha.api.config.HARuleConfiguration;
 import org.apache.shardingsphere.ha.api.config.rule.HADataSourceRuleConfiguration;
 import org.apache.shardingsphere.ha.rule.HARule;
+import org.apache.shardingsphere.infra.rule.builder.ShardingSphereRuleBuilder;
+import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.infra.spi.ordered.OrderedSPIRegistry;
 import org.junit.Test;
 
+import javax.sql.DataSource;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertThat;
@@ -46,6 +49,9 @@ public void assertBuild() {
                 "name", "primaryDataSourceName", Collections.singletonList("name"), "loadBalancerName", true);
         when(ruleConfig.getDataSources()).thenReturn(Collections.singletonList(dataSourceRuleConfig));
         ShardingSphereRuleBuilder builder = OrderedSPIRegistry.getRegisteredServices(Collections.singletonList(ruleConfig), ShardingSphereRuleBuilder.class).get(ruleConfig);
+        Map<String, DataSource> dataSourceMap = new HashMap<>();
+        dataSourceMap.put("primaryDataSourceName", mock(DataSource.class));
+        ((HARuleBuilder) builder).setDataSourceMap(dataSourceMap);
         assertThat(builder.build(ruleConfig), instanceOf(HARule.class));
     }
 }
diff --git a/...nce-core/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java b/...nce-core/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
@@ -163,15 +163,12 @@ public synchronized void renew(final SchemaPersistEvent event) {
      */
     @Subscribe
     public synchronized void renew(final PrimaryDataSourceUpdateEvent event) {
-        Map<String, DataSourceConfiguration> dataSourceConfigurations = loadDataSourceConfigurations(event.getSchemaName());
-        dataSourceConfigurations.remove(event.getOldPrimaryDataSource());
         Collection<RuleConfiguration> ruleConfigurations = loadRuleConfigurations(event.getSchemaName());
         for (RuleConfiguration each : ruleConfigurations) {
             if (each instanceof HARuleConfiguration) {
                 updateHaDataSourceRuleConfigurations(event, (HARuleConfiguration) each);
             }
         }
-        persistDataSourceConfigurations(event.getSchemaName(), dataSourceConfigurations);
         persistRuleConfigurations(event.getSchemaName(), ruleConfigurations);
     }
 

diff --git a/...c/main/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilder.java b/...c/main/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilder.java
@@ -117,6 +117,8 @@ private DatabaseType getDatabaseType(final Map<String, DataSource> dataSourceMap
     private DatabaseType getDatabaseType(final DataSource dataSource) throws SQLException {
         try (Connection connection = dataSource.getConnection()) {
             return DatabaseTypeRegistry.getDatabaseTypeByURL(connection.getMetaData().getURL());
+        } catch (final SQLException ex) {
+            return null;
         }
     }
 

diff --git a/.../proxy/backend/communication/jdbc/datasource/factory/JDBCRawBackendDataSourceFactory.java b/.../proxy/backend/communication/jdbc/datasource/factory/JDBCRawBackendDataSourceFactory.java
@@ -21,6 +21,7 @@
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shardingsphere.infra.config.datasource.JDBCParameterDecorator;
 import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
 import org.apache.shardingsphere.infra.exception.ShardingSphereException;
@@ -34,6 +35,7 @@
  * Backend data source factory using {@code HikariDataSource} for JDBC raw.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Slf4j
 public final class JDBCRawBackendDataSourceFactory implements JDBCBackendDataSourceFactory {
 
     private static final JDBCRawBackendDataSourceFactory INSTANCE = new JDBCRawBackendDataSourceFactory();
@@ -67,7 +69,15 @@ public DataSource build(final String dataSourceName, final DataSourceParameter d
         config.setMaximumPoolSize(dataSourceParameter.getMaxPoolSize());
         config.setMinimumIdle(dataSourceParameter.getMinPoolSize());
         config.setReadOnly(dataSourceParameter.isReadOnly());
-        DataSource result = new HikariDataSource(config);
+        DataSource result;
+        try {
+            result = new HikariDataSource(config);
+            // CHECKSTYLE:OFF
+        } catch (final Exception ex) {
+            // CHECKSTYLE:ON
+            log.error("Exception occur: ", ex);
+            return null;
+        }
         Optional<JDBCParameterDecorator> decorator = findJDBCParameterDecorator(result);
         return decorator.isPresent() ? decorator.get().decorate(result) : result;
     }

diff --git a/...n/java/org/apache/shardingsphere/proxy/initializer/impl/AbstractBootstrapInitializer.java b/...n/java/org/apache/shardingsphere/proxy/initializer/impl/AbstractBootstrapInitializer.java
@@ -80,7 +80,10 @@ private static Map<String, Map<String, DataSource>> createDataSourcesMap(final M
     private static Map<String, DataSource> createDataSources(final Map<String, DataSourceParameter> dataSourceParameters) {
         Map<String, DataSource> result = new LinkedHashMap<>(dataSourceParameters.size(), 1);
         for (Entry<String, DataSourceParameter> entry : dataSourceParameters.entrySet()) {
-            result.put(entry.getKey(), JDBCRawBackendDataSourceFactory.getInstance().build(entry.getKey(), entry.getValue()));
+            DataSource dataSource = JDBCRawBackendDataSourceFactory.getInstance().build(entry.getKey(), entry.getValue());
+            if (null != dataSource) {
+                result.put(entry.getKey(), dataSource);
+            }
         }
         return result;
     }