daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1582 from aaronlehmann/garbagecollect-errors 

garbagecollect: Clean up errors
master
Richard Scothern 2016-03-30 14:29:27 -07:00
parent 0eefe17730 267e268775
commit 791865af71
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
registry/garbagecollect.go
View File

@ -26,7 +26,7 @@ func markAndSweep(ctx context.Context, storageDriver driver.StorageDriver) error
repositoryEnumerator, ok := registry.(distribution.RepositoryEnumerator) repositoryEnumerator, ok := registry.(distribution.RepositoryEnumerator)
if !ok { if !ok {
return fmt.Errorf("coercion error: unable to convert Namespace to RepositoryEnumerator") return fmt.Errorf("unable to convert Namespace to RepositoryEnumerator")
} }
// mark // mark
@ -49,7 +49,7 @@ func markAndSweep(ctx context.Context, storageDriver driver.StorageDriver) error
manifestEnumerator, ok := manifestService.(distribution.ManifestEnumerator) manifestEnumerator, ok := manifestService.(distribution.ManifestEnumerator)
if !ok { if !ok {
return fmt.Errorf("coercion error: unable to convert ManifestService into ManifestEnumerator") return fmt.Errorf("unable to convert ManifestService into ManifestEnumerator")
} }
err = manifestEnumerator.Enumerate(ctx, func(dgst digest.Digest) error { err = manifestEnumerator.Enumerate(ctx, func(dgst digest.Digest) error {
@ -70,7 +70,7 @@ func markAndSweep(ctx context.Context, storageDriver driver.StorageDriver) error
case *schema1.SignedManifest: case *schema1.SignedManifest:
signaturesGetter, ok := manifestService.(distribution.SignaturesGetter) signaturesGetter, ok := manifestService.(distribution.SignaturesGetter)
if !ok { if !ok {
return fmt.Errorf("coercion error: unable to convert ManifestSErvice into SignaturesGetter") return fmt.Errorf("unable to convert ManifestService into SignaturesGetter")
} }
signatures, err := signaturesGetter.GetSignatures(ctx, dgst) signatures, err := signaturesGetter.GetSignatures(ctx, dgst)
if err != nil { if err != nil {
@ -106,6 +106,9 @@ func markAndSweep(ctx context.Context, storageDriver driver.StorageDriver) error
} }
return nil return nil
}) })
if err != nil {
return fmt.Errorf("error enumerating blobs: %v", err)
}
// Construct vacuum // Construct vacuum
vacuum := storage.NewVacuum(ctx, storageDriver) vacuum := storage.NewVacuum(ctx, storageDriver)