From 1d9e7df7fda58e8754547166f0c76e6c5f07282b Mon Sep 17 00:00:00 2001 From: guoaomen Date: Mon, 3 Apr 2023 14:09:02 +0800 Subject: [PATCH] fix: variable display and default settings --- .../java/com/actiontech/dble/config/model/SystemConfig.java | 3 +++ src/main/java/com/actiontech/dble/singleton/SystemParams.java | 1 + 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/actiontech/dble/config/model/SystemConfig.java b/src/main/java/com/actiontech/dble/config/model/SystemConfig.java index 819e6284d..8777ec4d6 100644 --- a/src/main/java/com/actiontech/dble/config/model/SystemConfig.java +++ b/src/main/java/com/actiontech/dble/config/model/SystemConfig.java @@ -1680,6 +1680,9 @@ public final class SystemConfig { } public MysqlVersion getMysqlVersion() { + if (this.mysqlVersion == null && this.fakeMySQLVersion != null) { + this.mysqlVersion = VersionUtil.parseVersion(this.fakeMySQLVersion); + } return mysqlVersion; } diff --git a/src/main/java/com/actiontech/dble/singleton/SystemParams.java b/src/main/java/com/actiontech/dble/singleton/SystemParams.java index 8020ff8b7..50891e68c 100644 --- a/src/main/java/com/actiontech/dble/singleton/SystemParams.java +++ b/src/main/java/com/actiontech/dble/singleton/SystemParams.java @@ -50,6 +50,7 @@ public final class SystemParams { readOnlyParams.add(new ParamInfo("clusterIP", ClusterConfig.getInstance().getClusterIP(), "Dble cluster center address, If clusterMode is zk, it is a full address with port")); if (!ClusterConfig.getInstance().getClusterMode().equalsIgnoreCase(CONFIG_MODE_ZK)) { readOnlyParams.add(new ParamInfo("clusterPort", ClusterConfig.getInstance().getClusterPort() == 0 ? "" : ClusterConfig.getInstance().getClusterPort() + "", "Dble cluster center address's port")); + readOnlyParams.add(new ParamInfo("grpcTimeout", ClusterConfig.getInstance().getGrpcTimeout() + "", "Under non-zk cluster configuration, the timeout period for calling the interface")); } readOnlyParams.add(new ParamInfo("rootPath", ClusterConfig.getInstance().getRootPath(), "Dble cluster center's root path, the default value is /dble")); readOnlyParams.add(new ParamInfo("clusterId", ClusterConfig.getInstance().getClusterId(), "Dble cluster Id"));