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

Merge pull request #172 from mlaventure/better-error-for-pause-and-resume

Browse source 
Return the runtime error message on failed pause and resume calls
This commit is contained in:
Michael Crosby 2016-04-01 14:25:52 -07:00
commit cb3c208a4d
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
runtime/container_linux.go
View file

@ -53,13 +53,21 @@ func (c *container) Runtime() string {
func (c *container) Pause() error { func (c *container) Pause() error {
args := c.runtimeArgs args := c.runtimeArgs
args = append(args, "pause", c.id) args = append(args, "pause", c.id)
return exec.Command(c.runtime, args...).Run() b, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil {
return fmt.Errorf(string(b))
}
return nil
} }
func (c *container) Resume() error { func (c *container) Resume() error {
args := c.runtimeArgs args := c.runtimeArgs
args = append(args, "resume", c.id) args = append(args, "resume", c.id)
return exec.Command(c.runtime, args...).Run() b, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil {
return fmt.Errorf(string(b))
}
return nil
} }
func (c *container) Checkpoints() ([]Checkpoint, error) { func (c *container) Checkpoints() ([]Checkpoint, error) {

4
supervisor/update.go
View file

@ -23,7 +23,7 @@ func (s *Supervisor) updateContainer(t *UpdateTask) error {
switch t.State { switch t.State {
case runtime.Running: case runtime.Running:
if err := container.Resume(); err != nil { if err := container.Resume(); err != nil {
return ErrUnknownContainerStatus return err
} }
s.notifySubscribers(Event{ s.notifySubscribers(Event{
ID: t.ID, ID: t.ID,
@ -32,7 +32,7 @@ func (s *Supervisor) updateContainer(t *UpdateTask) error {
}) })
case runtime.Paused: case runtime.Paused:
if err := container.Pause(); err != nil { if err := container.Pause(); err != nil {
return ErrUnknownContainerStatus return err
} }
s.notifySubscribers(Event{ s.notifySubscribers(Event{
ID: t.ID, ID: t.ID,