feat: 新增降低分区定时任务负载的功能 #4545

TencentBlueKing · Jun 18, 2024 · 4b68f66 · 4b68f66
1 parent 3fe79ea
commit 4b68f66
Show file tree

Hide file tree

Showing 62 changed files with 1,931 additions and 742 deletions.
diff --git a/dbm-services/common/go-pubpkg/errno/50000_dbpartition_code.go b/dbm-services/common/go-pubpkg/errno/50000_dbpartition_code.go
@@ -29,5 +29,6 @@ var (
 	DomainNotExists           = Errno{Code: 52030, Message: "domain not exists", CNMessage: "域名不存在"}
 	NotSupportedPartitionType = Errno{Code: 52031, Message: "not supported partition type", CNMessage: "不支持的分区类型"}
 	WrongPartitionNameFormat  = Errno{Code: 52032, Message: "wrong partition name format ", CNMessage: "分区名格式错误"}
-	DownloadDbactorFail       = Errno{Code: 52030, Message: "download dbactor fail", CNMessage: "下载dbactor失败"}
+	DownloadDbactorFail       = Errno{Code: 52033, Message: "download dbactor fail", CNMessage: "下载dbactor失败"}
+	DownloadFileFail          = Errno{Code: 52034, Message: "download file fail", CNMessage: "下载文件失败"}
 )
diff --git a/dbm-services/common/go-pubpkg/errno/50000_dbpriv_code.go b/dbm-services/common/go-pubpkg/errno/50000_dbpriv_code.go
@@ -69,7 +69,7 @@ var (
 		CNMessage: "要求包含的字符类型大于字符串长度"}
 	TryTooManyTimes = Errno{Code: 51024, Message: "try too many times", CNMessage: "尝试太多次"}
 	RuleIdNull      = Errno{Code: 51025, Message: "Rule ID should not be empty",
-		CNMessage: "安全规则的id不能为空"}
+		CNMessage: "规则的id不能为空"}
 	RuleNameNull = Errno{Code: 51026, Message: "Rule name should not be empty",
 		CNMessage: "安全规则的名称不能为空"}
 	RuleExisted       = Errno{Code: 51027, Message: "Rule already existed ", CNMessage: "规则已存在"}

diff --git a/dbm-services/mysql/db-partition/assests/migrations/000006_init.down.sql b/dbm-services/mysql/db-partition/assests/migrations/000006_init.down.sql
@@ -0,0 +1 @@
+SET NAMES utf8;
diff --git a/dbm-services/mysql/db-partition/assests/migrations/000006_init.up.sql b/dbm-services/mysql/db-partition/assests/migrations/000006_init.up.sql
@@ -0,0 +1,5 @@
+SET NAMES utf8;
+alter table mysql_partition_cron_log drop column bk_biz_id,drop column cluster_id,drop column ticket_id,
+    drop column immute_domain,drop column bk_cloud_id,drop column time_zone;
+alter table spider_partition_cron_log drop column bk_biz_id,drop column cluster_id,drop column ticket_id,
+    drop column immute_domain,drop column bk_cloud_id,drop column time_zone;
diff --git a/dbm-services/mysql/db-partition/cron/cron_basic_func.go b/dbm-services/mysql/db-partition/cron/cron_basic_func.go
diff --git a/dbm-services/mysql/db-partition/cron/cron_object.go b/dbm-services/mysql/db-partition/cron/cron_object.go
diff --git a/dbm-services/mysql/db-partition/go.mod b/dbm-services/mysql/db-partition/go.mod
@@ -13,6 +13,7 @@ require (
 	github.com/spf13/viper v1.16.0
 	go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.46.1
 	golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0
+	golang.org/x/time v0.1.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gorm.io/driver/mysql v1.5.1
 	gorm.io/gorm v1.25.4

diff --git a/dbm-services/mysql/db-partition/go.sum b/dbm-services/mysql/db-partition/go.sum
@@ -478,6 +478,8 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA=
+golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=