Merge pull request #8456 from ywk253100/190729_scheduler

Register the scheduler job and fix bugs
This commit is contained in:
Ziming 2019-07-30 08:57:10 +08:00 committed by GitHub
commit a5c31d7160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 12 deletions

View File

@ -109,10 +109,10 @@ func main() {
log.Fatalf("failed to load config: %v", err)
}
// init the scheduler
scheduler.Init()
// init the jobservice client
job.Init()
// init the scheduler
scheduler.Init()
password, err := config.InitialAdminPassword()
if err != nil {

View File

@ -23,6 +23,8 @@ import (
"syscall"
"time"
"github.com/goharbor/harbor/src/pkg/scheduler"
"github.com/goharbor/harbor/src/jobservice/api"
"github.com/goharbor/harbor/src/jobservice/common/utils"
"github.com/goharbor/harbor/src/jobservice/config"
@ -239,12 +241,13 @@ func (bs *Bootstrap) loadAndRunRedisWorkerPool(
// Only for debugging and testing purpose
job.SampleJob: (*sample.Job)(nil),
// Functional jobs
job.ImageScanJob: (*scan.ClairJob)(nil),
job.ImageScanAllJob: (*scan.All)(nil),
job.ImageGC: (*gc.GarbageCollector)(nil),
job.Replication: (*replication.Replication)(nil),
job.ReplicationScheduler: (*replication.Scheduler)(nil),
job.Retention: (*retention.Job)(nil),
job.ImageScanJob: (*scan.ClairJob)(nil),
job.ImageScanAllJob: (*scan.All)(nil),
job.ImageGC: (*gc.GarbageCollector)(nil),
job.Replication: (*replication.Replication)(nil),
job.ReplicationScheduler: (*replication.Scheduler)(nil),
job.Retention: (*retention.Job)(nil),
scheduler.JobNameScheduler: (*scheduler.PeriodicJob)(nil),
}); err != nil {
// exit
return nil, err

View File

@ -92,8 +92,8 @@ type launcher struct {
}
type jobData struct {
repository *res.Repository
policy *lwp.Metadata
repository res.Repository
policy lwp.Metadata
taskID int64
}
@ -197,8 +197,8 @@ func (l *launcher) Launch(ply *policy.Metadata, executionID int64, isDryRun bool
return 0, launcherError(err)
}
jobDatas = append(jobDatas, &jobData{
repository: &repo,
policy: p,
repository: repo,
policy: *p,
taskID: taskID,
})
}