From b9773acfcf28c3b64ed72444341a2befdbe124e7 Mon Sep 17 00:00:00 2001
From: maxshuang <huangguohao@pingcap.com>
Date: Wed, 8 Jun 2022 23:08:13 +0800
Subject: [PATCH] fix(job): fix jobmanager error

---
 engine/lib/common.go        |  2 +-
 engine/model/job.go         | 18 ++++++++++--------
 engine/pkg/promutil/util.go |  5 +++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/engine/lib/common.go b/engine/lib/common.go
index bb3cde83a47..0948a21b0ee 100644
--- a/engine/lib/common.go
+++ b/engine/lib/common.go
@@ -79,7 +79,7 @@ func WorkerTypeToJobType(t WorkerType) dfModel.JobType {
 	switch t {
 	case JobManager:
 		// jobmanager is the framework level job
-		// no job type
+		return dfModel.JobTypeJobManager
 	case CvsJobMaster, CvsTask:
 		return dfModel.JobTypeCVSDemo
 	case FakeJobMaster, FakeTask:
diff --git a/engine/model/job.go b/engine/model/job.go
index b2bebd0f2af..5bf549f7382 100644
--- a/engine/model/job.go
+++ b/engine/model/job.go
@@ -28,6 +28,8 @@ type (
 // Define job type
 const (
 	JobTypeInvalid = JobType(iota)
+	// job type for job manager, only for inner use
+	JobTypeJobManager
 	JobTypeCVSDemo
 	JobTypeDM
 	JobTypeCDC
@@ -35,17 +37,17 @@ const (
 )
 
 var jobTypeName = map[int32]string{
-	1: "CVSDemo",
-	2: "DM",
-	3: "CDC",
-	4: "FakeJob",
+	2: "CVSDemo",
+	3: "DM",
+	4: "CDC",
+	5: "FakeJob",
 }
 
 var jobTypeValue = map[string]int32{
-	"CVSDemo": 1,
-	"DM":      2,
-	"CDC":     3,
-	"FakeJob": 4,
+	"CVSDemo": 2,
+	"DM":      3,
+	"CDC":     4,
+	"FakeJob": 5,
 }
 
 // MustJobTypeByName get job type by name. Panic if it fails.
diff --git a/engine/pkg/promutil/util.go b/engine/pkg/promutil/util.go
index bf5e95913c6..0e478ab6a90 100644
--- a/engine/pkg/promutil/util.go
+++ b/engine/pkg/promutil/util.go
@@ -79,6 +79,11 @@ func HTTPHandlerForMetric() http.Handler {
 
 // NewFactory4Master return a Factory for jobmaster
 func NewFactory4Master(info tenant.ProjectInfo, jobType dfModel.JobType, jobID dfModel.JobID) Factory {
+	// Only for the jobmanager
+	if jobType == dfModel.JobTypeJobManager {
+		return NewFactory4Framework()
+	}
+
 	return NewFactory4MasterImpl(globalMetricRegistry, info, jobType, jobID)
 }