diff --git a/src/controller/jobmonitor/monitor.go b/src/controller/jobmonitor/monitor.go index a23ca0b7461..04ca93b553c 100644 --- a/src/controller/jobmonitor/monitor.go +++ b/src/controller/jobmonitor/monitor.go @@ -20,18 +20,17 @@ import ( "strings" "time" - "github.com/gocraft/work" - - "github.com/goharbor/harbor/src/common/job" - libRedis "github.com/goharbor/harbor/src/lib/redis" - jobSvc "github.com/goharbor/harbor/src/jobservice/job" "github.com/goharbor/harbor/src/lib/orm" "github.com/goharbor/harbor/src/pkg/queuestatus" "github.com/goharbor/harbor/src/lib/log" + "github.com/gocraft/work" + + "github.com/goharbor/harbor/src/common/job" "github.com/goharbor/harbor/src/lib/q" + libRedis "github.com/goharbor/harbor/src/lib/redis" jm "github.com/goharbor/harbor/src/pkg/jobmonitor" "github.com/goharbor/harbor/src/pkg/task" taskDao "github.com/goharbor/harbor/src/pkg/task/dao" diff --git a/src/controller/replication/flow/copy.go b/src/controller/replication/flow/copy.go index 870ab6fb99a..7c6b823bb14 100644 --- a/src/controller/replication/flow/copy.go +++ b/src/controller/replication/flow/copy.go @@ -92,7 +92,7 @@ func (c *copyFlow) Run(ctx context.Context) error { return err } - return c.createTasks(ctx, srcResources, dstResources) + return c.createTasks(ctx, srcResources, dstResources, c.policy.Speed, c.policy.CopyByChunk) } func (c *copyFlow) isExecutionStopped(ctx context.Context) (bool, error) { @@ -103,7 +103,7 @@ func (c *copyFlow) isExecutionStopped(ctx context.Context) (bool, error) { return execution.Status == job.StoppedStatus.String(), nil } -func (c *copyFlow) createTasks(ctx context.Context, srcResources, dstResources []*model.Resource) error { +func (c *copyFlow) createTasks(ctx context.Context, srcResources, dstResources []*model.Resource, speed int32, copyByChunk bool) error { var taskCnt int defer func() { // if no task be created, mark execution done. @@ -139,18 +139,17 @@ func (c *copyFlow) createTasks(ctx context.Context, srcResources, dstResources [ Parameters: map[string]interface{}{ "src_resource": string(src), "dst_resource": string(dest), - "speed": c.policy.Speed, - "copy_by_chunk": c.policy.CopyByChunk, + "speed": speed, + "copy_by_chunk": copyByChunk, }, } if _, err = c.taskMgr.Create(ctx, c.executionID, job, map[string]interface{}{ "operation": "copy", - "resource_type": srcResource.Type, + "resource_type": string(srcResource.Type), "source_resource": getResourceName(srcResource), "destination_resource": getResourceName(dstResource), - "references": getResourceReferences(dstResource), - }); err != nil { + "references": getResourceReferences(dstResource)}); err != nil { return err }