Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-20 07:37:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9532 from heww/issue-9151

Browse Source 
fix(gc,quota): clean blob size cache in redis when gc
This commit is contained in:
Wenkai Yin(尹文开) 2019-10-23 17:03:22 +08:00 committed by GitHub
commit c3c8b03af5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jobservice/job/impl/gc/job.go
View File

@ -17,6 +17,7 @@ package gc
import ( import (
"fmt" "fmt"
"os" "os"
"strconv"
"time" "time"
"github.com/garyburd/redigo/redis" "github.com/garyburd/redigo/redis"
@ -29,7 +30,6 @@ import (
"github.com/goharbor/harbor/src/jobservice/logger" "github.com/goharbor/harbor/src/jobservice/logger"
"github.com/goharbor/harbor/src/pkg/types" "github.com/goharbor/harbor/src/pkg/types"
"github.com/goharbor/harbor/src/registryctl/client" "github.com/goharbor/harbor/src/registryctl/client"
"strconv"
) )
const ( const (
@ -38,6 +38,7 @@ const (
dialWriteTimeout = 10 * time.Second dialWriteTimeout = 10 * time.Second
blobPrefix = "blobs::*" blobPrefix = "blobs::*"
repoPrefix = "repository::*" repoPrefix = "repository::*"
uploadSizePattern = "upload:*:size"
) )
// GarbageCollector is the struct to run registry's garbage collection // GarbageCollector is the struct to run registry's garbage collection
@ -156,15 +157,13 @@ func (gc *GarbageCollector) cleanCache() error {
// sample of keys in registry redis: // sample of keys in registry redis:
// 1) "blobs::sha256:1a6fd470b9ce10849be79e99529a88371dff60c60aab424c077007f6979b4812" // 1) "blobs::sha256:1a6fd470b9ce10849be79e99529a88371dff60c60aab424c077007f6979b4812"
// 2) "repository::library/hello-world::blobs::sha256:4ab4c602aa5eed5528a6620ff18a1dc4faef0e1ab3a5eddeddb410714478c67f" // 2) "repository::library/hello-world::blobs::sha256:4ab4c602aa5eed5528a6620ff18a1dc4faef0e1ab3a5eddeddb410714478c67f"
err = delKeys(con, blobPrefix) // 3) "upload:fbd2e0a3-262d-40bb-abe4-2f43aa6f9cda:size"
if err != nil { patterns := []string{blobPrefix, repoPrefix, uploadSizePattern}
gc.logger.Errorf("failed to clean registry cache %v, pattern blobs::*", err) for _, pattern := range patterns {
if err := delKeys(con, pattern); err != nil {
gc.logger.Errorf("failed to clean registry cache %v, pattern %s", err, pattern)
return err return err
} }
err = delKeys(con, repoPrefix)
if err != nil {
gc.logger.Errorf("failed to clean registry cache %v, pattern repository::*", err)
return err
} }
return nil return nil