config: verify subtask config when generating from task (pingcap#98)

lichunzhu · Apr 1, 2019 · 514e0da · 514e0da
1 parent 3941bee
commit 514e0da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/dm/config/task.go b/dm/config/task.go
@@ -485,6 +485,11 @@ func (c *TaskConfig) SubTaskConfigs(sources map[string]DBConfig) ([]*SubTaskConf
 		cfg.LoaderConfig = *inst.Loader
 		cfg.SyncerConfig = *inst.Syncer
 
+		err := cfg.adjust()
+		if err != nil {
+			return nil, errors.Annotatef(err, "source %s", inst.SourceID)
+		}
+
 		cfgs[i] = cfg
 	}
 	return cfgs, nil

diff --git a/dm/master/server.go b/dm/master/server.go
@@ -191,7 +191,7 @@ func (s *Server) StartTask(ctx context.Context, req *pb.StartTaskRequest) (*pb.S
 	if err != nil {
 		return &pb.StartTaskResponse{
 			Result: false,
-			Msg:    errors.Cause(err).Error(),
+			Msg:    errors.ErrorStack(err),
 		}, nil
 	}
 	log.Infof("[server] starting task with config:\n%v", cfg)
@@ -374,7 +374,7 @@ func (s *Server) UpdateTask(ctx context.Context, req *pb.UpdateTaskRequest) (*pb
 	if err != nil {
 		return &pb.UpdateTaskResponse{
 			Result: false,
-			Msg:    errors.Cause(err).Error(),
+			Msg:    errors.ErrorStack(err),
 		}, nil
 	}
 	log.Infof("[server] update task with config:\n%v", cfg)