dm-portal: don't generate table list for mydumper if DoTables is empty (

#419) (#421)
pingcap · Dec 12, 2019 · 8ecc2c8 · 8ecc2c8
1 parent 17b3959
commit 8ecc2c8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/dm/portal/api.go b/dm/portal/api.go
@@ -563,12 +563,17 @@ func generateMydumperCfg(bwList *filter.Rules) *config.MydumperConfig {
 		tables = append(tables, fmt.Sprintf("%s.%s", table.Schema, table.Name))
 	}
 
+	extraArgs := ""
+	if len(tables) != 0 {
+		extraArgs = fmt.Sprintf("-T %s", strings.Join(tables, ","))
+	}
+
 	return &config.MydumperConfig{
 		MydumperPath:  "bin/mydumper",
 		Threads:       4,
 		ChunkFilesize: 64,
 		SkipTzUTC:     true,
-		ExtraArgs:     fmt.Sprintf("-T %s", strings.Join(tables, ",")),
+		ExtraArgs:     extraArgs,
 	}
 }
 

diff --git a/dm/portal/api_test.go b/dm/portal/api_test.go
@@ -329,6 +329,10 @@ func (t *testPortalSuite) TestGenerateMydumperTableCfg(c *C) {
 	}
 	mydumperCfg := generateMydumperCfg(bwList)
 	c.Assert(mydumperCfg.ExtraArgs, Equals, "-T db_1.t_1,db_1.t_2")
+
+	bwList = &filter.Rules{}
+	mydumperCfg = generateMydumperCfg(bwList)
+	c.Assert(mydumperCfg.ExtraArgs, Equals, "")
 }
 
 func (t *testPortalSuite) TestGenerateMydumperCfgName(c *C) {