explicitly set EnableHeartbeat to false when create subtasks and upgrade

from 1.0
pingcap · Mar 1, 2021 · 9aca3ec · 9aca3ec
1 parent 0ba44df
commit 9aca3ec
Show file tree

Hide file tree

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

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/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