Merge pull request #2598 from Random-Liu/fix-state-error-handling

estesp · web-flow · commit a09bad557f9f · 2018-08-31T08:06:04.000-07:00
Fix `runc state` error handling.
diff --git a/runtime/v1/linux/proc/init.go b/runtime/v1/linux/proc/init.go
@@ -228,7 +228,7 @@ func (p *Init) Status(ctx context.Context) (string, error) {
 	defer p.mu.Unlock()
 	c, err := p.runtime.State(ctx, p.id)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if strings.Contains(err.Error(), "does not exist") {
 			return "stopped", nil
 		}
 		return "", p.runtimeError(err, "OCI runtime state failed")

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ func (p *Init) Status(ctx context.Context) (string, error) {`
`228`	`228`	`defer p.mu.Unlock()`
`229`	`229`	`c, err := p.runtime.State(ctx, p.id)`
`230`	`230`	`if err != nil {`
`231`		`- if os.IsNotExist(err) {`
	`231`	`+ if strings.Contains(err.Error(), "does not exist") {`
`232`	`232`	`return "stopped", nil`
`233`	`233`	`}`
`234`	`234`	`return "", p.runtimeError(err, "OCI runtime state failed")`