Skip to content

Make import image more efficient #10244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 1 commit into from
Aug 9, 2016
Merged

Make import image more efficient #10244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkg/image/importer/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (r *mockRetriever) Repository(ctx gocontext.Context, registry *url.URL, rep
}

type mockRepository struct {
repoErr, getErr, getTagErr, tagErr, untagErr, allTagErr, err error
repoErr, getErr, getByTagErr, getTagErr, tagErr, untagErr, allTagErr, err error

blobs *mockBlobStore

Expand All @@ -59,6 +59,11 @@ func (r *mockRepository) Exists(ctx context.Context, dgst digest.Digest) (bool,
return false, r.getErr
}
func (r *mockRepository) Get(ctx context.Context, dgst digest.Digest, options ...distribution.ManifestServiceOption) (distribution.Manifest, error) {
for _, option := range options {
if _, ok := option.(distribution.WithTagOption); ok {
return r.manifest, r.getByTagErr
}
}
return r.manifest, r.getErr
}
func (r *mockRepository) Delete(ctx context.Context, dgst digest.Digest) error {
Expand Down
29 changes: 18 additions & 11 deletions pkg/image/importer/importer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,25 +484,32 @@ func (isi *ImageStreamImporter) importRepositoryFromDocker(ctx gocontext.Context
continue
}
limiter.Accept()
desc, err := repo.Tags(ctx).Get(ctx, importTag.Name)
if err != nil {
glog.V(5).Infof("unable to get tag %q for repository %#v: %#v", importTag.Name, repository, err)
importTag.Err = formatRepositoryError(repository, importTag.Name, "", err)
continue
}
manifest, err := s.Get(ctx, desc.Digest)

manifest, err := s.Get(ctx, "", distribution.WithTag(importTag.Name))
if err != nil {
glog.V(5).Infof("unable to access digest %q for tag %q for repository %#v: %#v", desc.Digest, importTag.Name, repository, err)
importTag.Err = formatRepositoryError(repository, importTag.Name, "", err)
continue
glog.V(5).Infof("unable to get manifest by tag %q for repository %#v: %#v", importTag.Name, repository, err)
// try to resolve the tag and fetch manifest by digest instead
desc, getTagErr := repo.Tags(ctx).Get(ctx, importTag.Name)
if getTagErr != nil {
glog.V(5).Infof("unable to get tag %q for repository %#v: %#v", importTag.Name, repository, getTagErr)
importTag.Err = formatRepositoryError(repository, importTag.Name, "", err)
continue
}
m, getManifestErr := s.Get(ctx, desc.Digest)
if getManifestErr != nil {
glog.V(5).Infof("unable to access digest %q for tag %q for repository %#v: %#v", desc.Digest, importTag.Name, repository, getManifestErr)
importTag.Err = formatRepositoryError(repository, importTag.Name, "", err)
continue
}
manifest = m
}

if signedManifest, isSchema1 := manifest.(*schema1.SignedManifest); isSchema1 {
importTag.Image, err = schema1ToImage(signedManifest, "")
} else if deserializedManifest, isSchema2 := manifest.(*schema2.DeserializedManifest); isSchema2 {
imageConfig, err := b.Get(ctx, deserializedManifest.Config.Digest)
if err != nil {
glog.V(5).Infof("unable to access image config using digest %q for tag %q for repository %#v: %#v", desc.Digest, importTag.Name, repository, err)
glog.V(5).Infof("unable to access image config using digest %q for tag %q for repository %#v: %#v", deserializedManifest.Config.Digest, importTag.Name, repository, err)
importTag.Err = formatRepositoryError(repository, importTag.Name, "", err)
continue
}
Expand Down
17 changes: 10 additions & 7 deletions pkg/image/importer/importer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ func TestImport(t *testing.T) {
}
insecureRetriever := &mockRetriever{
repo: &mockRepository{
getTagErr: fmt.Errorf("no such tag"),
getErr: fmt.Errorf("no such digest"),
getTagErr: fmt.Errorf("no such tag"),
getByTagErr: fmt.Errorf("no such manifest tag"),
getErr: fmt.Errorf("no such digest"),
},
}
testCases := []struct {
Expand All @@ -65,8 +66,9 @@ func TestImport(t *testing.T) {
{
retriever: &mockRetriever{
repo: &mockRepository{
getTagErr: fmt.Errorf("no such tag"),
getErr: fmt.Errorf("no such digest"),
getTagErr: fmt.Errorf("no such tag"),
getByTagErr: fmt.Errorf("no such manifest tag"),
getErr: fmt.Errorf("no such digest"),
},
},
isi: api.ImageStreamImport{
Expand All @@ -80,7 +82,7 @@ func TestImport(t *testing.T) {
},
},
expect: func(isi *api.ImageStreamImport, t *testing.T) {
if !expectStatusError(isi.Status.Images[0].Status, "Internal error occurred: no such tag") {
if !expectStatusError(isi.Status.Images[0].Status, "Internal error occurred: no such manifest tag") {
t.Errorf("unexpected status: %#v", isi.Status.Images[0].Status)
}
if !expectStatusError(isi.Status.Images[1].Status, "Internal error occurred: no such digest") {
Expand Down Expand Up @@ -167,7 +169,8 @@ func TestImport(t *testing.T) {
"3.1": "sha256:958608f8ecc1dc62c93b6c610f3a834dae4220c9642e6e8b4e0f2b3ad7cbd238",
"abc": "sha256:958608f8ecc1dc62c93b6c610f3a834dae4220c9642e6e8b4e0f2b3ad7cbd238",
},
getTagErr: fmt.Errorf("no such tag"),
getTagErr: fmt.Errorf("no such tag"),
getByTagErr: fmt.Errorf("no such manifest tag"),
},
},
isi: api.ImageStreamImport{
Expand All @@ -186,7 +189,7 @@ func TestImport(t *testing.T) {
}
expectedTags := []string{"3", "v2", "v1", "3.1", "abc"}
for i, image := range isi.Status.Repository.Images {
if image.Status.Status != unversioned.StatusFailure || image.Status.Message != "Internal error occurred: no such tag" {
if image.Status.Status != unversioned.StatusFailure || image.Status.Message != "Internal error occurred: no such manifest tag" {
t.Errorf("unexpected status %d: %#v", i, isi.Status.Repository.Images)
}
if image.Tag != expectedTags[i] {
Expand Down