Merge pull request cri-o#362 from nalind/nameasdigest

runcom · web-flow · commit 0639f06d0360 · 2017-02-08T17:36:29.000+01:00
Don't try to parse an image ID a second time
diff --git a/pkg/storage/runtime.go b/pkg/storage/runtime.go
@@ -167,21 +167,14 @@ func (r *runtimeService) createContainerOrPodSandbox(systemContext *types.System
 			ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), otherRef.DockerReference().FullName())
 		}
 		if err != nil {
-			// maybe it's just imageID
+			// Maybe the image ID is sufficient?
 			ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), "@"+imageID)
 			if err != nil {
 				return ContainerInfo{}, err
 			}
 		}
 	}
 	img, err := istorage.Transport.GetStoreImage(r.image.GetStore(), ref)
-	if img == nil && err == storage.ErrImageUnknown && imageID != "" {
-		ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), "@"+imageID)
-		if err != nil {
-			return ContainerInfo{}, err
-		}
-		img, err = istorage.Transport.GetStoreImage(r.image.GetStore(), ref)
-	}
 	if img == nil && err == storage.ErrImageUnknown && imageName == r.pauseImage {
 		image := imageID
 		if imageName != "" {

Original file line number	Diff line number	Diff line change
`@@ -167,21 +167,14 @@ func (r runtimeService) createContainerOrPodSandbox(systemContext types.System`
`167`	`167`	`ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), otherRef.DockerReference().FullName())`
`168`	`168`	`}`
`169`	`169`	`if err != nil {`
`170`		`- // maybe it's just imageID`
	`170`	`+ // Maybe the image ID is sufficient?`
`171`	`171`	`ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), "@"+imageID)`
`172`	`172`	`if err != nil {`
`173`	`173`	`return ContainerInfo{}, err`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`img, err := istorage.Transport.GetStoreImage(r.image.GetStore(), ref)`
`178`		`- if img == nil && err == storage.ErrImageUnknown && imageID != "" {`
`179`		`- ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), "@"+imageID)`
`180`		`- if err != nil {`
`181`		`- return ContainerInfo{}, err`
`182`		`- }`
`183`		`- img, err = istorage.Transport.GetStoreImage(r.image.GetStore(), ref)`
`184`		`- }`
`185`	`178`	`if img == nil && err == storage.ErrImageUnknown && imageName == r.pauseImage {`
`186`	`179`	`image := imageID`
`187`	`180`	`if imageName != "" {`