engine: exclude CreateEmptyVolumeError from retry

agent/api/errors.go

@@ -46,7 +46,7 @@ type NamedError interface {
 	ErrorName() string
 }
 
-// NamedError is a wrapper type for 'error' which adds an optional name and provides a symetric marshal/unmarshal
+// NamedError is a wrapper type for 'error' which adds an optional name and provides a symmetric marshal/unmarshal
 type DefaultNamedError struct {
 	Err  string `json:"error"`
 	Name string `json:"name"`

agent/engine/docker_container_engine.go

@@ -274,7 +274,7 @@ func (dg *dockerGoClient) pullImage(image string, authData *api.RegistryAuthenti
 	if image == emptyvolume.Image+":"+emptyvolume.Tag {
 		scratchErr := dg.createScratchImageIfNotExists()
 		if scratchErr != nil {
-			return &api.DefaultNamedError{Name: "CreateEmptyVolumeError", Err: "Could not create empty volume " + scratchErr.Error()}
+			return CreateEmptyVolumeError{scratchErr}
 		}
 		return nil
 	}

agent/engine/errors.go

@@ -209,6 +209,23 @@ func (err CannotPullECRContainerError) Retry() bool {
 	return false
 }
 
+type CreateEmptyVolumeError struct {
+	fromError error
+}
+
+func (err CreateEmptyVolumeError) Error() string {
+	return err.fromError.Error()
+}
+
+func (err CreateEmptyVolumeError) ErrorName() string {
+	return "CreateEmptyVolumeError"
+}
+
+// Retry fulfills the utils.Retrier interface and allows retries to be skipped by utils.Retry* functions
+func (err CreateEmptyVolumeError) Retry() bool {
+	return false
+}
+
 // CannotCreateContainerError indicates any error when trying to create a container
 type CannotCreateContainerError struct {
 	fromError error