Merge pull request #33 from SphereEx/fix-5.5.1

Update the default value of instance-connection-enabled to true
apache · Nov 1, 2024 · 095708e · 095708e
2 parents 8324e65 + 720f93b
commit 095708e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...apache/shardingsphere/infra/config/props/temporary/TemporaryConfigurationPropertyKey.java b/...apache/shardingsphere/infra/config/props/temporary/TemporaryConfigurationPropertyKey.java
@@ -71,7 +71,7 @@ public enum TemporaryConfigurationPropertyKey implements TypedPropertyKey {
      * Instance connection enabled.
      */
     @SphereEx
-    INSTANCE_CONNECTION_ENABLED("instance-connection-enabled", String.valueOf(Boolean.FALSE), boolean.class, false),
+    INSTANCE_CONNECTION_ENABLED("instance-connection-enabled", String.valueOf(Boolean.TRUE), boolean.class, false),
 
     @SphereEx
     DROP_CURRENT_USER_ENABLED("drop-current-user-enabled", String.valueOf(Boolean.TRUE), boolean.class, false);

diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
@@ -30,6 +30,7 @@
 import org.apache.shardingsphere.infra.config.database.impl.DataSourceGeneratedDatabaseConfiguration;
 import org.apache.shardingsphere.infra.config.database.impl.DataSourceProvidedDatabaseConfiguration;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
+import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationProperties;
 import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData;
@@ -156,8 +157,7 @@ private static MetaDataContexts createByLocal(final MetaDataPersistService persi
     private static MetaDataContexts createByRepository(final MetaDataPersistService persistService, final ContextManagerBuilderParameter param,
                                                        final ComputeNodeInstanceContext computeNodeInstanceContext, @SphereEx final Map<String, QualifiedDataSourceState> statusMap) {
         @SphereEx
-        boolean isInstanceConnectionEnabled = Boolean.parseBoolean(
-                String.valueOf(param.getProps().getOrDefault(TemporaryConfigurationPropertyKey.INSTANCE_CONNECTION_ENABLED.getKey(), Boolean.FALSE.toString())));
+        boolean isInstanceConnectionEnabled = new TemporaryConfigurationProperties(persistService.getPropsService().load()).getValue(TemporaryConfigurationPropertyKey.INSTANCE_CONNECTION_ENABLED);
         @SphereEx(Type.MODIFY)
         Map<String, DatabaseConfiguration> effectiveDatabaseConfigs =
                 createEffectiveDatabaseConfigurations(getDatabaseNames(persistService), param.getDatabaseConfigs(), persistService, isInstanceConnectionEnabled);