fix(dbm-services): dbha切换域名指向CLB失败 #6884

TencentBlueKing · Sep 12, 2024 · 07007b9 · 07007b9
1 parent eda7906
commit 07007b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/dbm-services/common/dbha/ha-module/dbmodule/redis/redis_base.go b/dbm-services/common/dbha/ha-module/dbmodule/redis/redis_base.go
@@ -156,9 +156,9 @@ func (ins *RedisProxySwitchInfo) ShowSwitchInstanceInfo() string {
 
 // KickOffDns kick instance from dns
 func (ins *RedisProxySwitchInfo) KickOffDns() error {
-	if !ins.ApiGw.DNSFlag {
-		log.Logger.Infof("no need kickDNS,info:%s",
-			ins.ShowSwitchInstanceInfo())
+	if !ins.ApiGw.DNSFlag || ins.ApiGw.DNSForword {
+		log.Logger.Infof("switch proxy ignore dns , 4 {WithDNS:%+v, DNSForword:%+v}; info:%s",
+			ins.ApiGw.DNSFlag, ins.ApiGw.DNSForword, ins.ShowSwitchInstanceInfo())
 		return nil
 	}
 

diff --git a/dbm-services/common/dbha/ha-module/dbmodule/redis/rediscluster_callback.go b/dbm-services/common/dbha/ha-module/dbmodule/redis/rediscluster_callback.go
@@ -25,11 +25,11 @@ func RedisClusterNewIns(instances []interface{}, conf *config.Config) ([]dbutil.
 		return nil, err
 	}
 
-	var predixyIns, redisIns []dbutil.DataBaseDetect
+	var predixyIns []dbutil.DataBaseDetect
 	for _, uIns := range unmarshalIns {
 		// check the cluster_type should be PredixyRedisCluster
 		if uIns.ClusterType != constvar.PredixyRedisCluster {
-			redisIns = append(redisIns, NewRedisClusterDetectInstance(uIns, conf))
+			continue
 		}
 
 		// create detect instance by machine_type
@@ -41,7 +41,6 @@ func RedisClusterNewIns(instances []interface{}, conf *config.Config) ([]dbutil.
 	// get pass from config system.
 	GetInstancePass(predixyIns, conf)
 
-	ret = append(ret, redisIns...)
 	ret = append(ret, predixyIns...)
 	return ret, err
 }