github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-08-19 23:38:13 +00:00
Code Issues Projects Releases Wiki Activity

fix signature on RemoveLayerLink

Browse Source
This commit is contained in:
Wayne Warren 2020-09-02 21:53:43 +00:00
parent 5fcc8f55e2
commit ec64b15a77
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
registry/storage/garbagecollect.go
View File

@ -142,7 +142,7 @@ func MarkAndSweep(ctx context.Context, storageDriver driver.StorageDriver, regis
}
for _, layerDgst := range obj.Layers {
if _, ok := markSet[layerDgst]; !ok {
err := vacuum.RemoveLayerLink(obj.Name, string(layerDgst))
err := vacuum.RemoveLayerLink(obj.Name, layerDgst)
if err != nil {
return fmt.Errorf("failed to delete layer link %s for manifest %s: %v", layerDgst, obj.Name, err)
}

9
registry/storage/vacuum.go
View File

@ -85,13 +85,8 @@ func (v Vacuum) RemoveManifest(name string, dgst digest.Digest, tags []string) e
}
// RemoveLayerLink removes a layer link from the filesystem
func (v Vacuum) RemoveLayerLink(manifestName, dgst string) error {
d, err := digest.Parse(dgst)
if err != nil {
return err
}
layerLinkPath, err := pathFor(layerLinkPathSpec{name: manifestName, digest: d})
func (v Vacuum) RemoveLayerLink(manifestName string, dgst digest.Digest) error {
layerLinkPath, err := pathFor(layerLinkPathSpec{name: manifestName, digest: dgst})
if err != nil {
return err
}