vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Add a better error msg

Browse source 
See https://github.com/docker/docker/issues/22643 for an example
where we get an error running a cmd but there's no output so `b`
is an empty string, which means the user doesn't see any interesting
error message to help them.

This PR will send back the `err` and `b` so that between those two
bits of info they should get something more than a blank string.

Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
Doug Davis 2016-05-10 20:26:41 -07:00
parent cdbe1d05f8
commit 8ffaa02cd9
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
runtime/container.go
View file

@ -294,7 +294,7 @@ func (c *container) UpdateResources(r *Resource) error {
cmd.Stdin = srStr cmd.Stdin = srStr
b, err := cmd.CombinedOutput() b, err := cmd.CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf(string(b)) return fmt.Errorf("%s: %q", err.Error(), string(b))
} }
return nil return nil
} }
@ -335,7 +335,7 @@ func (c *container) Pause() error {
args = append(args, "pause", c.id) args = append(args, "pause", c.id)
b, err := exec.Command(c.runtime, args...).CombinedOutput() b, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf(string(b)) return fmt.Errorf("%s: %q", err.Error(), string(b))
} }
return nil return nil
} }
@ -345,7 +345,7 @@ func (c *container) Resume() error {
args = append(args, "resume", c.id) args = append(args, "resume", c.id)
b, err := exec.Command(c.runtime, args...).CombinedOutput() b, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf(string(b)) return fmt.Errorf("%s: %q", err.Error(), string(b))
} }
return nil return nil
} }
@ -415,7 +415,7 @@ func (c *container) Checkpoint(cpt Checkpoint) error {
add(c.id) add(c.id)
out, err := exec.Command(c.runtime, args...).CombinedOutput() out, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("%s: %s", err.Error(), string(out)) return fmt.Errorf("%s: %q", err.Error(), string(out))
} }
return err return err
} }
@ -548,7 +548,7 @@ func (c *container) Pids() ([]int, error) {
args = append(args, "ps", "--format=json", c.id) args = append(args, "ps", "--format=json", c.id)
out, err := exec.Command(c.runtime, args...).CombinedOutput() out, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil { if err != nil {
return nil, fmt.Errorf("%s", out) return nil, fmt.Errorf("%s: %q", err.Error(), out)
} }
var pids []int var pids []int
if err := json.Unmarshal(out, &pids); err != nil { if err := json.Unmarshal(out, &pids); err != nil {
@ -563,7 +563,7 @@ func (c *container) Stats() (*Stat, error) {
args = append(args, "events", "--stats", c.id) args = append(args, "events", "--stats", c.id)
out, err := exec.Command(c.runtime, args...).CombinedOutput() out, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil { if err != nil {
return nil, fmt.Errorf("%s", out) return nil, fmt.Errorf("%s: %q", err.Error(), out)
} }
s := struct { s := struct {
Data *Stat `json:"data"` Data *Stat `json:"data"`
@ -602,7 +602,7 @@ func (c *container) Status() (State, error) {
out, err := exec.Command(c.runtime, args...).CombinedOutput() out, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil { if err != nil {
return "", fmt.Errorf("%s", out) return "", fmt.Errorf("%s: %q", err.Error(), out)
} }
// We only require the runtime json output to have a top level Status field. // We only require the runtime json output to have a top level Status field.