refactor(dbm-services): 允许执行create table like TencentBlueKing#7199

ymakedaq · Sep 30, 2024 · f594d40 · f594d40
1 parent fce8454
commit f594d40
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dbm-services/common/dbha/ha-module/test/agent_test.go b/dbm-services/common/dbha/ha-module/test/agent_test.go
@@ -68,7 +68,7 @@ func TestAgentNetTransfor(t *testing.T) {
 		case 3:
 			dbIns.App = "APP4444"
 		}
-		err = agentIns.ReporterGM(d)
+		err = agentIns.RepairGM(&gmInfo)
 		if err != nil {
 			t.Errorf("reporter gmInfo failed.err:%s", err.Error())
 			return

diff --git a/dbm-services/mysql/db-simulation/handler/handler.go b/dbm-services/mysql/db-simulation/handler/handler.go
@@ -36,8 +36,9 @@ type Response struct {
 
 // CreateClusterParam 创建临时的spider的集群参数
 type CreateClusterParam struct {
-	Pwd     string `json:"pwd"`
-	PodName string `json:"podname"`
+	Pwd           string `json:"pwd"`
+	PodName       string `json:"podname"`
+	SpiderVersion string `json:"spider_version"`
 }
 
 // CreateTmpSpiderPodCluster 创建临时的spider的集群,多用于测试，debug
@@ -55,8 +56,7 @@ func CreateTmpSpiderPodCluster(r *gin.Context) {
 		Charset: "utf8mb4",
 	}
 	ps.DbImage = config.GAppConfig.Image.Tendb57Img
-	ps.TdbCtlImage = config.GAppConfig.Image.TdbCtlImg
-	ps.SpiderImage = config.GAppConfig.Image.SpiderImg
+	ps.TdbCtlImage, ps.SpiderImage = getSpiderAndTdbctlImg(param.SpiderVersion, LatestVersion)
 	if err := ps.CreateClusterPod(); err != nil {
 		logger.Error(err.Error())
 		return