Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-18 13:41:21 +01:00
Code Issues Projects Releases Wiki Activity

remove limitation of artifact in the GC job (#12595)

Browse Source 
To handle the orphan blobs that created in the quota exceeding case deletion, remove the limition of artifact remove.

Signed-off-by: wang yan <wangyan@vmware.com>
This commit is contained in:
Wang Yan 2020-07-29 12:04:30 +08:00 committed by GitHub
parent b2593589ec
commit cf46775fd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jobservice/job/impl/gc/garbage_collection.go
View File

@ -184,11 +184,9 @@ func (gc *GarbageCollector) mark(ctx job.Context) error {
gc.logger.Errorf("failed to get deleted Artifacts in gc job, with error: %v", err)
return err
}
// no need to execute GC as there is no removed artifacts.
// Do this is to handle if user trigger GC job several times, only one job should do the following logic as artifact trash table is flushed.
// just log it, the job will continue to execute, the orphan blobs that created in the quota exceeding case can be removed.
if len(arts) == 0 {
gc.logger.Info("no need to execute GC as there is no removed artifacts.")
return nil
gc.logger.Warning("no removed artifacts.")
}
gc.trashedArts = arts

22
src/jobservice/job/impl/gc/garbage_collection_test.go
View File

@ -221,6 +221,28 @@ func (suite *gcTestSuite) TestRun() {
mock.OnAnything(suite.blobMgr, "CleanupAssociationsForProject").Return(nil)
mock.OnAnything(suite.blobMgr, "UselessBlobs").Return([]*pkg_blob.Blob{
{
ID: 1,
Digest: suite.DigestString(),
ContentType: schema2.MediaTypeManifest,
},
{
ID: 2,
Digest: suite.DigestString(),
ContentType: schema2.MediaTypeLayer,
},
{
ID: 3,
Digest: suite.DigestString(),
ContentType: schema2.MediaTypeManifest,
},
}, nil)
mock.OnAnything(suite.blobMgr, "UpdateBlobStatus").Return(int64(1), nil)
mock.OnAnything(suite.blobMgr, "Delete").Return(nil)
gc := &GarbageCollector{
artCtl: suite.artifactCtl,
artrashMgr: suite.artrashMgr,