Fix Method of judging command execution failure

Ace-Tang · Ace-Tang · commit 4e99c72acdb0 · 2019-05-28T17:01:17.000+08:00
should judge restore and run command execution failure depend both on error and
status Monitor.Wait() return

Signed-off-by: Ace-Tang &lt;aceapril@126.com&gt;
diff --git a/runc.go b/runc.go
@@ -275,7 +275,11 @@ func (r *Runc) Run(context context.Context, id, bundle string, opts *CreateOpts)
 	if err != nil {
 		return -1, err
 	}
-	return Monitor.Wait(cmd, ec)
+	status, err := Monitor.Wait(cmd, ec)
+	if err == nil && status != 0 {
+		err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0])
+	}
+	return status, err
 }
 
 type DeleteOpts struct {
@@ -570,7 +574,11 @@ func (r *Runc) Restore(context context.Context, id, bundle string, opts *Restore
 			}
 		}
 	}
-	return Monitor.Wait(cmd, ec)
+	status, err := Monitor.Wait(cmd, ec)
+	if err == nil && status != 0 {
+		err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0])
+	}
+	return status, err
 }
 
 // Update updates the current container with the provided resource spec

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,11 @@ func (r Runc) Run(context context.Context, id, bundle string, opts CreateOpts)`
`275`	`275`	`if err != nil {`
`276`	`276`	`return -1, err`
`277`	`277`	`}`
`278`		`- return Monitor.Wait(cmd, ec)`
	`278`	`+ status, err := Monitor.Wait(cmd, ec)`
	`279`	`+ if err == nil && status != 0 {`
	`280`	`+ err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0])`
	`281`	`+ }`
	`282`	`+ return status, err`
`279`	`283`	`}`
`280`	`284`
`281`	`285`	`type DeleteOpts struct {`
`@@ -570,7 +574,11 @@ func (r Runc) Restore(context context.Context, id, bundle string, opts Restore`
`570`	`574`	`}`
`571`	`575`	`}`
`572`	`576`	`}`
`573`		`- return Monitor.Wait(cmd, ec)`
	`577`	`+ status, err := Monitor.Wait(cmd, ec)`
	`578`	`+ if err == nil && status != 0 {`
	`579`	`+ err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0])`
	`580`	`+ }`
	`581`	`+ return status, err`
`574`	`582`	`}`
`575`	`583`
`576`	`584`	`// Update updates the current container with the provided resource spec`