config: disable heartbeat feature (#1467)

pingcap · Mar 8, 2021 · 139a71b · 139a71b
1 parent 864aaa4
commit 139a71b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/dm/config/task.go b/dm/config/task.go
@@ -626,7 +626,10 @@ func (c *TaskConfig) SubTaskConfigs(sources map[string]DBConfig) ([]*SubTaskConf
 		cfg.Mode = c.TaskMode
 		cfg.CaseSensitive = c.CaseSensitive
 		cfg.MetaSchema = c.MetaSchema
-		cfg.EnableHeartbeat = c.EnableHeartbeat
+		cfg.EnableHeartbeat = false
+		if c.EnableHeartbeat {
+			log.L().Warn("DM 2.0 does not support heartbeat feature, will overwrite it to false")
+		}
 		cfg.HeartbeatUpdateInterval = c.HeartbeatUpdateInterval
 		cfg.HeartbeatReportInterval = c.HeartbeatReportInterval
 		cfg.Timezone = c.Timezone

diff --git a/dm/config/task_test.go b/dm/config/task_test.go
@@ -805,6 +805,11 @@ func (t *testConfig) TestGenAndFromSubTaskConfigs(c *C) {
 	// deprecated config will not recover
 	stCfgs[0].EnableANSIQuotes = stCfg1.EnableANSIQuotes
 	stCfgs[1].EnableANSIQuotes = stCfg2.EnableANSIQuotes
+	// some features are disabled
+	c.Assert(stCfg1.EnableHeartbeat, IsTrue)
+	c.Assert(stCfg2.EnableHeartbeat, IsTrue)
+	stCfg1.EnableHeartbeat = false
+	stCfg2.EnableHeartbeat = false
 	c.Assert(stCfgs[0].String(), Equals, stCfg1.String())
 	c.Assert(stCfgs[1].String(), Equals, stCfg2.String())
 }

diff --git a/pkg/v1workermeta/api.go b/pkg/v1workermeta/api.go
@@ -98,6 +98,8 @@ func SubTaskConfigFromV1TOML(data []byte) (config.SubTaskConfig, error) {
 	}
 
 	cfg := v1Cfg.SubTaskConfig
+	// DM v2.0 doesn't support heartbeat, overwrite it to false
+	cfg.EnableHeartbeat = false
 	cfg.MydumperConfig.ChunkFilesize = strconv.FormatInt(v1Cfg.ChunkFilesize, 10)
 	err = cfg.Adjust(true)
 	if err != nil {

diff --git a/tests/import_v10x/conf/task.yaml b/tests/import_v10x/conf/task.yaml
@@ -4,7 +4,7 @@ is-sharding: false
 shard-mode: ""
 ignore-checking-items: []
 meta-schema: dm_meta
-enable-heartbeat: true
+enable-heartbeat: false
 heartbeat-update-interval: 1
 heartbeat-report-interval: 1
 timezone: Asia/Shanghai

diff --git a/tests/tiup/conf/task.yaml b/tests/tiup/conf/task.yaml
@@ -2,6 +2,7 @@
 name: upgrade_via_tiup
 task-mode: all
 is-sharding: true
+enable-heartbeat: true
 
 target-database:
   host: tidb