fix(dbm-services): 解决errchan容量太小可能触发的死锁问题 #7962

TencentBlueKing · Nov 14, 2024 · 5fa4916 · 5fa4916
1 parent 6e6d856
commit 5fa4916
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...services/mysql/db-tools/dbactuator/pkg/components/spiderctl/import_schema_from_backend.go b/...services/mysql/db-tools/dbactuator/pkg/components/spiderctl/import_schema_from_backend.go
@@ -334,7 +334,7 @@ func (c *ImportSchemaFromBackendComp) migrateUseMysqlDump() (err error) {
 		Password:         c.GeneralParam.RuntimeAccountParam.AdminPwd,
 		WorkDir:          c.tmpDumpDir,
 	}
-	errChan := make(chan error)
+	errChan := make(chan error, len(c.dumpDbs))
 	wg := sync.WaitGroup{}
 	ctrChan := make(chan struct{}, c.maxThreads)
 	for _, db := range c.dumpDbs {

diff --git a/dbm-services/mysql/db-tools/dbactuator/pkg/util/mysqlutil/mysql_dumper.go b/dbm-services/mysql/db-tools/dbactuator/pkg/util/mysqlutil/mysql_dumper.go
@@ -96,9 +96,9 @@ func (m MySQLDumper) Dump() (err error) {
 	m.init()
 	var wg sync.WaitGroup
 	var errs []error
-	errChan := make(chan error, 1)
 	concurrencyControl := make(chan struct{}, m.maxConcurrency)
 	dumpMap := m.GetDumpFileInfo()
+	errChan := make(chan error, len(dumpMap))
 	for db, outputFileName := range dumpMap {
 		dumper := m
 		dumper.DbNames = []string{db}