fix

apecloud · Dec 4, 2024 · 1bec78d · 1bec78d
1 parent caddc86
commit 1bec78d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/engines/redis/manager.go b/engines/redis/manager.go
@@ -37,9 +37,8 @@ const (
 	EnvRootUser   = "REDIS_DEFAULT_USER"
 	EnvRootPasswd = "REDIS_DEFAULT_PASSWORD"
 
-	EnvRedisHostNetworkPort         = "DBCTL_REDIS_HOST_NETWORK_PORT"
-	EnvRedisSentinelHostNetworkPort = "DBCTL_REDIS_SENTINEL_HOST_NETWORK_PORT"
-	EnvRedisClusterHostNetworkPort  = "DBCTL_REDIS_CLUSTER_HOST_NETWORK_PORT"
+	EnvRedisServicePort         = "DBCTL_REDIS_SERVICE_PORT"
+	EnvRedisSentinelServicePort = "DBCTL_REDIS_SENTINEL_SERVICE_PORT"
 )
 
 var (
@@ -78,10 +77,8 @@ func NewManager(properties engines.Properties) (engines.DBManager, error) {
 		redisPasswd = viper.GetString(EnvRootPasswd)
 	}
 
-	if viper.IsSet(EnvRedisHostNetworkPort) {
-		properties["redisHost"] = fmt.Sprintf("127.0.0.1:%s", viper.GetString(EnvRedisHostNetworkPort))
-	} else if viper.IsSet(EnvRedisClusterHostNetworkPort) {
-		properties["redisHost"] = fmt.Sprintf("127.0.0.1:%s", viper.GetString(EnvRedisClusterHostNetworkPort))
+	if viper.IsSet(EnvRedisServicePort) {
+		properties["redisHost"] = fmt.Sprintf("127.0.0.1:%s", viper.GetString(EnvRedisServicePort))
 	}
 
 	managerBase, err := engines.NewDBManagerBase(logger)

diff --git a/engines/redis/redis.go b/engines/redis/redis.go
@@ -146,8 +146,8 @@ func newClient(s *Settings) redis.UniversalClient {
 func newSentinelClient(s *Settings, clusterCompName string) *redis.SentinelClient {
 	sentinelHost := fmt.Sprintf("%s-sentinel-headless", clusterCompName)
 	sentinelPort := "26379"
-	if viper.IsSet(EnvRedisSentinelHostNetworkPort) {
-		sentinelPort = viper.GetString(EnvRedisSentinelHostNetworkPort)
+	if viper.IsSet(EnvRedisSentinelServicePort) {
+		sentinelPort = viper.GetString(EnvRedisSentinelServicePort)
 	}
 
 	opt := &redis.Options{