Skip to content

Commit

Permalink
fix(job): fix jobmanager error
Browse files Browse the repository at this point in the history
  • Loading branch information
maxshuang committed Jun 8, 2022
1 parent ca0af13 commit b9773ac
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion engine/lib/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
18 changes: 10 additions & 8 deletions engine/model/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,26 @@ type (
// Define job type
const (
JobTypeInvalid = JobType(iota)
// job type for job manager, only for inner use
JobTypeJobManager
JobTypeCVSDemo
JobTypeDM
JobTypeCDC
JobTypeFakeJob
)

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.
Expand Down
5 changes: 5 additions & 0 deletions engine/pkg/promutil/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down

0 comments on commit b9773ac

Please sign in to comment.