Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 02:35:17 +01:00
Code Issues Projects Releases Wiki Activity

fix: using new ctx to scan artifact when scanAll

Browse Source 
DB transaction failure may break the loop query of the artifacts, the
result is that not all artifacts are scanned in one scan all job. Using
a new DB connection to call the Scan method of the controller to avoid
this problem.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
This commit is contained in:
He Weiwei 2021-05-13 12:32:58 +00:00
parent fa46b0d736
commit f800d531ec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/controller/scan/base_controller.go
View File

@ -327,7 +327,7 @@ func (bc *basicController) startScanAll(ctx context.Context, executionID int64)
return bc.Scan(ctx, artifact, WithExecutionID(executionID))
}
if err := orm.WithTransaction(scan)(ctx); err != nil {
if err := orm.WithTransaction(scan)(bc.makeCtx()); err != nil {
// Just logged
log.Errorf("failed to scan artifact %s, error %v", artifact, err)

2
src/controller/scan/base_controller_test.go
View File

@ -278,7 +278,7 @@ func (suite *ControllerTestSuite) SetupSuite() {
},
cloneCtx: func(ctx context.Context) context.Context { return ctx },
makeCtx: func() context.Context { return context.TODO() },
makeCtx: func() context.Context { return orm.NewContext(nil, &ormtesting.FakeOrmer{}) },
execMgr: suite.execMgr,
taskMgr: suite.taskMgr,