Merge pull request #8456 from ywk253100/190729_scheduler

Register the scheduler job and fix bugs

src/core/main.go

@@ -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 {

src/jobservice/runtime/bootstrap.go

@@ -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.ImageScanJob:           (*scan.ClairJob)(nil),
-			job.ImageScanAllJob:      (*scan.All)(nil),
+			job.ImageScanAllJob:        (*scan.All)(nil),
-			job.ImageGC:              (*gc.GarbageCollector)(nil),
+			job.ImageGC:                (*gc.GarbageCollector)(nil),
-			job.Replication:          (*replication.Replication)(nil),
+			job.Replication:            (*replication.Replication)(nil),
-			job.ReplicationScheduler: (*replication.Scheduler)(nil),
+			job.ReplicationScheduler:   (*replication.Scheduler)(nil),
-			job.Retention:            (*retention.Job)(nil),
+			job.Retention:              (*retention.Job)(nil),
+			scheduler.JobNameScheduler: (*scheduler.PeriodicJob)(nil),
 		}); err != nil {
 		// exit
 		return nil, err

src/pkg/retention/launcher.go

@@ -92,8 +92,8 @@ type launcher struct {
 }
 
 type jobData struct {
-	repository *res.Repository
+	repository res.Repository
-	policy     *lwp.Metadata
+	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,
+			repository: repo,
-			policy:     p,
+			policy:     *p,
 			taskID:     taskID,
 		})
 	}