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

revise the blob logs

Browse Source 
1, update typo in the update blob status sql, the typo will not impact the sql result.
2, correct blob status in the middleware & GC job log.

Signed-off-by: wang yan <wangyan@vmware.com>
This commit is contained in:
wang yan 2020-07-29 12:31:31 +08:00
parent cf46775fd7
commit 20df844d5a
4 changed files with 7 additions and 9 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

@ -224,7 +224,6 @@ func (gc *GarbageCollector) mark(ctx job.Context) error {
} }
gc.logger.Infof("blob eligible for deletion: %s", blob.Digest) gc.logger.Infof("blob eligible for deletion: %s", blob.Digest)
gc.deleteSet = append(gc.deleteSet, blob) gc.deleteSet = append(gc.deleteSet, blob)
// as table blob has no repository name, here needs to use the ArtifactTrash to fill it in.
if blob.IsManifest() { if blob.IsManifest() {
mfCt++ mfCt++
} else { } else {
@ -233,7 +232,7 @@ func (gc *GarbageCollector) mark(ctx job.Context) error {
makeSize = makeSize + blob.Size makeSize = makeSize + blob.Size
} }
gc.logger.Infof("%d blobs and %d manifests eligible for deletion", blobCt, mfCt) gc.logger.Infof("%d blobs and %d manifests eligible for deletion", blobCt, mfCt)
gc.logger.Infof("The GC could free up %d MB space, the size is a rough estimate.", makeSize/1024/1024) gc.logger.Infof("The GC could free up %d MB space, the size is a rough estimation.", makeSize/1024/1024)
return nil return nil
} }
@ -294,7 +293,6 @@ func (gc *GarbageCollector) sweep(ctx job.Context) error {
return err return err
} }
return errors.Wrapf(err, "failed to delete blob from storage: %s, %s", blob.Digest, blob.Status) return errors.Wrapf(err, "failed to delete blob from storage: %s, %s", blob.Digest, blob.Status)
} }
// remove the blob record // remove the blob record
@ -479,7 +477,7 @@ func (gc *GarbageCollector) markDeleteFailed(ctx job.Context, blob *blob_models.
return errors.Wrapf(err, "failed to mark gc candidate delete failed: %s, %s", blob.Digest, blob.Status) return errors.Wrapf(err, "failed to mark gc candidate delete failed: %s, %s", blob.Digest, blob.Status)
} }
if count == 0 { if count == 0 {
return errors.New(nil).WithMessage("no blob found to mark gc candidate, ID:%d, digest:%s", blob.ID, blob.Digest).WithCode(errors.NotFoundCode) return errors.New(nil).WithMessage("no blob found to mark delete failed, ID:%d, digest:%s", blob.ID, blob.Digest).WithCode(errors.NotFoundCode)
} }
return nil return nil
} }

4
src/pkg/blob/dao/dao.go
View File

@ -181,9 +181,9 @@ func (d *dao) UpdateBlobStatus(ctx context.Context, blob *models.Blob) (int64, e
var sql string var sql string
if blob.Status == models.StatusNone { if blob.Status == models.StatusNone {
sql = `UPDATE blob SET version = version + 1, update_time = ?, status = ? where id = ? AND version >= ? AND status IN (%s) RETURNING version as new_vesrion` sql = `UPDATE blob SET version = version + 1, update_time = ?, status = ? where id = ? AND version >= ? AND status IN (%s) RETURNING version as new_version`
} else { } else {
sql = `UPDATE blob SET version = version + 1, update_time = ?, status = ? where id = ? AND version = ? AND status IN (%s) RETURNING version as new_vesrion` sql = `UPDATE blob SET version = version + 1, update_time = ?, status = ? where id = ? AND version = ? AND status IN (%s) RETURNING version as new_version`
} }
var newVersion int64 var newVersion int64

4
src/server/middleware/blob/head_blob.go
View File

@ -55,9 +55,9 @@ func handleHead(req *http.Request) error {
return errors.Wrapf(err, fmt.Sprintf("the request id is: %s", req.Header.Get(requestid.HeaderXRequestID))) return errors.Wrapf(err, fmt.Sprintf("the request id is: %s", req.Header.Get(requestid.HeaderXRequestID)))
} }
} }
return errors.New(nil).WithMessage(fmt.Sprintf("the asking blob is delete failed, mark it as non existing, request id: %s", req.Header.Get(requestid.HeaderXRequestID))).WithCode(errors.NotFoundCode)
case blob_models.StatusDeleteFailed:
return errors.New(nil).WithMessage(fmt.Sprintf("the asking blob is in GC, mark it as non existing, request id: %s", req.Header.Get(requestid.HeaderXRequestID))).WithCode(errors.NotFoundCode) return errors.New(nil).WithMessage(fmt.Sprintf("the asking blob is in GC, mark it as non existing, request id: %s", req.Header.Get(requestid.HeaderXRequestID))).WithCode(errors.NotFoundCode)
case blob_models.StatusDeleteFailed:
return errors.New(nil).WithMessage(fmt.Sprintf("the asking blob is delete failed, mark it as non existing, request id: %s", req.Header.Get(requestid.HeaderXRequestID))).WithCode(errors.NotFoundCode)
default: default:
return errors.New(nil).WithMessage(fmt.Sprintf("wrong blob status, %s", bb.Status)) return errors.New(nil).WithMessage(fmt.Sprintf("wrong blob status, %s", bb.Status))
} }

2
src/server/middleware/blob/util.go
View File

@ -42,7 +42,7 @@ func probeBlob(r *http.Request, digest string) error {
// StatusDeleteFailed => StatusNone, and then let the proxy to handle manifest upload // StatusDeleteFailed => StatusNone, and then let the proxy to handle manifest upload
return probeBlob(r, digest) return probeBlob(r, digest)
} }
return errors.New(nil).WithMessage(fmt.Sprintf("the asking blob is delete failed, mark it as non existing, request id: %s", r.Header.Get(requestid.HeaderXRequestID))).WithCode(errors.NotFoundCode) return errors.New(nil).WithMessage(fmt.Sprintf("the asking blob is in GC, mark it as non existing, request id: %s", r.Header.Get(requestid.HeaderXRequestID))).WithCode(errors.NotFoundCode)
default: default:
return nil return nil
} }