Skip to content

Commit 0201169

Browse files
author
Oleg Bulatov
committed
Add -prune option to dockerregistry
Signed-off-by: Oleg Bulatov <[email protected]>
1 parent 322171b commit 0201169

File tree

3 files changed

+178
-4
lines changed

3 files changed

+178
-4
lines changed

pkg/cmd/dockerregistry/dockerregistry.go

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ package dockerregistry
33
import (
44
"crypto/tls"
55
"crypto/x509"
6+
"flag"
67
"fmt"
78
"io"
89
"io/ioutil"
910
"net/http"
1011
"os"
12+
"strings"
1113
"time"
1214

1315
log "github.com/Sirupsen/logrus"
@@ -19,8 +21,10 @@ import (
1921
"github.com/docker/distribution/health"
2022
"github.com/docker/distribution/registry/auth"
2123
"github.com/docker/distribution/registry/handlers"
24+
"github.com/docker/distribution/registry/storage"
25+
"github.com/docker/distribution/registry/storage/driver/factory"
2226
"github.com/docker/distribution/uuid"
23-
"github.com/docker/distribution/version"
27+
distversion "github.com/docker/distribution/version"
2428

2529
_ "github.com/docker/distribution/registry/auth/htpasswd"
2630
_ "github.com/docker/distribution/registry/auth/token"
@@ -35,18 +39,64 @@ import (
3539
_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
3640
_ "github.com/docker/distribution/registry/storage/driver/swift"
3741

38-
"strings"
42+
kubeversion "k8s.io/kubernetes/pkg/version"
3943

4044
"github.com/openshift/origin/pkg/cmd/server/crypto"
4145
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
4246
"github.com/openshift/origin/pkg/dockerregistry/server"
4347
"github.com/openshift/origin/pkg/dockerregistry/server/api"
4448
"github.com/openshift/origin/pkg/dockerregistry/server/audit"
4549
registryconfig "github.com/openshift/origin/pkg/dockerregistry/server/configuration"
50+
"github.com/openshift/origin/pkg/version"
4651
)
4752

53+
var prune = flag.Bool("prune", false, "prune blobs from the storage and exit")
54+
55+
func versionFields() log.Fields {
56+
return log.Fields{
57+
"distribution_version": distversion.Version,
58+
"kubernetes_version": kubeversion.Get(),
59+
"openshift_version": version.Get(),
60+
}
61+
}
62+
63+
// ExecutePruner runs the pruner.
64+
func ExecutePruner(configFile io.Reader) {
65+
log.WithFields(versionFields()).Info("start prune")
66+
67+
config, _, err := registryconfig.Parse(configFile)
68+
if err != nil {
69+
log.Fatalf("error parsing configuration file: %s", err)
70+
}
71+
72+
ctx := context.Background()
73+
ctx, err = configureLogging(ctx, config)
74+
if err != nil {
75+
log.Fatalf("error configuring logging: %s", err)
76+
}
77+
78+
registryClient := server.NewRegistryClient(clientcmd.NewConfig().BindToFile())
79+
80+
storageDriver, err := factory.Create(config.Storage.Type(), config.Storage.Parameters())
81+
if err != nil {
82+
log.Fatalf("error creating storage driver: %s", err)
83+
}
84+
85+
registry, err := storage.NewRegistry(ctx, storageDriver, storage.EnableDelete)
86+
if err != nil {
87+
log.Fatalf("error creating registry: %s", err)
88+
}
89+
90+
server.Prune(ctx, storageDriver, registry, registryClient)
91+
}
92+
4893
// Execute runs the Docker registry.
4994
func Execute(configFile io.Reader) {
95+
if *prune {
96+
ExecutePruner(configFile)
97+
return
98+
}
99+
50100
dockerConfig, extraConfig, err := registryconfig.Parse(configFile)
51101
if err != nil {
52102
log.Fatalf("error parsing configuration file: %s", err)
@@ -64,7 +114,7 @@ func Execute(configFile io.Reader) {
64114
registryClient := server.NewRegistryClient(clientcmd.NewConfig().BindToFile())
65115
ctx = server.WithRegistryClient(ctx, registryClient)
66116

67-
log.Infof("version=%s", version.Version)
117+
log.WithFields(versionFields()).Info("start registry")
68118
// inject a logger into the uuid library. warns us if there is a problem
69119
// with uuid generation under low entropy.
70120
uuid.Loggerf = context.GetLogger(ctx).Warnf

pkg/dockerregistry/server/errorblobstore.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ func (f statCrossMountCreateOptions) Apply(v interface{}) error {
151151
if err != nil {
152152
context.GetLogger(f.ctx).Infof("cannot mount blob %s from repository %s: %v - disabling cross-repo mount",
153153
opts.Mount.From.Digest().String(),
154-
opts.Mount.From.Name())
154+
opts.Mount.From.Name(),
155+
err)
155156
opts.Mount.ShouldMount = false
156157
return nil
157158
}

pkg/dockerregistry/server/prune.go

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
package server
2+
3+
import (
4+
"fmt"
5+
6+
"github.com/docker/distribution"
7+
"github.com/docker/distribution/context"
8+
"github.com/docker/distribution/digest"
9+
"github.com/docker/distribution/manifest/schema2"
10+
"github.com/docker/distribution/reference"
11+
"github.com/docker/distribution/registry/storage"
12+
"github.com/docker/distribution/registry/storage/driver"
13+
14+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
15+
)
16+
17+
// Prune removes blobs which are not used by Images in OpenShift.
18+
//
19+
// TODO(dmage): remove layer links to a blob if the blob is removed or it doesn't belong to the ImageStream.
20+
// TODO(dmage): remove manifests that are not mentioned in the ImageStream.
21+
// TODO(dmage): keep young blobs (docker/distribution#2297).
22+
func Prune(ctx context.Context, storageDriver driver.StorageDriver, registry distribution.Namespace, registryClient RegistryClient) {
23+
logger := context.GetLogger(ctx)
24+
25+
repositoryEnumerator, ok := registry.(distribution.RepositoryEnumerator)
26+
if !ok {
27+
logger.Fatal("unable to convert Namespace to RepositoryEnumerator")
28+
}
29+
30+
oc, _, err := registryClient.Clients()
31+
if err != nil {
32+
logger.Fatalf("error getting clients: %s", err)
33+
}
34+
35+
imageList, err := oc.Images().List(metav1.ListOptions{})
36+
if err != nil {
37+
logger.Fatalf("error listing images: %s", err)
38+
}
39+
40+
inuse := make(map[string]string)
41+
for _, image := range imageList.Items {
42+
// Keep the manifest.
43+
inuse[image.Name] = image.DockerImageReference
44+
45+
// Keep the config for a schema 2 manifest.
46+
if image.DockerImageManifestMediaType == schema2.MediaTypeManifest {
47+
inuse[image.DockerImageMetadata.ID] = image.DockerImageReference
48+
}
49+
50+
// Keep image layers.
51+
for _, layer := range image.DockerImageLayers {
52+
inuse[layer.Name] = image.DockerImageReference
53+
}
54+
}
55+
56+
err = repositoryEnumerator.Enumerate(ctx, func(repoName string) error {
57+
logger.Debugln("Processing repository", repoName)
58+
59+
named, err := reference.WithName(repoName)
60+
if err != nil {
61+
return fmt.Errorf("failed to parse repo name %s: %v", repoName, err)
62+
}
63+
64+
repository, err := registry.Repository(ctx, named)
65+
if err != nil {
66+
return err
67+
}
68+
69+
manifestService, err := repository.Manifests(ctx)
70+
if err != nil {
71+
return err
72+
}
73+
74+
manifestEnumerator, ok := manifestService.(distribution.ManifestEnumerator)
75+
if !ok {
76+
return fmt.Errorf("unable to convert ManifestService into ManifestEnumerator")
77+
}
78+
79+
err = manifestEnumerator.Enumerate(ctx, func(dgst digest.Digest) error {
80+
if imageReference, ok := inuse[string(dgst)]; ok {
81+
logger.Debugf("Keep manifest %s@%s (manifest belongs to image %s)", repoName, dgst, imageReference)
82+
return nil
83+
}
84+
85+
logger.Printf("Deleting manifest: %s@%s", repoName, dgst)
86+
err := manifestService.Delete(ctx, dgst)
87+
if err != nil {
88+
return fmt.Errorf("failed to delete manifest %s: %s", dgst, err)
89+
}
90+
91+
return nil
92+
})
93+
if e, ok := err.(driver.PathNotFoundError); ok {
94+
logger.Warnf("prune manifests in repository %s: %s", repoName, e)
95+
} else if err != nil {
96+
return fmt.Errorf("failed to prune manifests in repository %s: %s", repoName, err)
97+
}
98+
99+
return nil
100+
})
101+
if err != nil {
102+
logger.Fatal(err)
103+
}
104+
105+
logger.Debugln("Processing blobs")
106+
vacuum := storage.NewVacuum(ctx, storageDriver)
107+
err = registry.Blobs().Enumerate(ctx, func(dgst digest.Digest) error {
108+
if imageReference, ok := inuse[string(dgst)]; ok {
109+
logger.Debugf("Keep blob %s (blob belongs to image %s)", dgst, imageReference)
110+
return nil
111+
}
112+
113+
err := vacuum.RemoveBlob(string(dgst))
114+
if err != nil {
115+
return fmt.Errorf("failed to delete blob %s: %s", dgst, err)
116+
}
117+
118+
return nil
119+
})
120+
if err != nil {
121+
logger.Fatal(err)
122+
}
123+
}

0 commit comments

Comments
 (0)