kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Address comments.

Browse source 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
This commit is contained in:
Vishnu Kannan 2014-10-30 23:06:54 +00:00
parent f96e04ffc7
commit 46f2944977
6 changed files with 34 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/daemon.go
View file

@ -991,7 +991,7 @@ func (daemon *Daemon) Diff(container *Container) (archive.Archive, error) {
return daemon.driver.Diff(container.ID, initID) return daemon.driver.Diff(container.ID, initID)
} }
func (daemon *Daemon) Run(c *Container, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (*execdriver.ExitStatus, error) { func (daemon *Daemon) Run(c *Container, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (execdriver.ExitStatus, error) {
return daemon.execDriver.Run(c.command, pipes, startCallback) return daemon.execDriver.Run(c.command, pipes, startCallback)
} }

2
daemon/execdriver/driver.go
View file

@ -50,7 +50,7 @@ type ExitStatus struct {
} }
type Driver interface { type Driver interface {
Run(c *Command, pipes *Pipes, startCallback StartCallback) (int, error) // Run executes the process and blocks until the process exits and returns the exit code Run(c *Command, pipes *Pipes, startCallback StartCallback) (ExitStatus, error) // Run executes the process and blocks until the process exits and returns the exit code
// Exec executes the process in an existing container, blocks until the process exits and returns the exit code // Exec executes the process in an existing container, blocks until the process exits and returns the exit code
Exec(c *Command, processConfig *ProcessConfig, pipes *Pipes, startCallback StartCallback) (int, error) Exec(c *Command, processConfig *ProcessConfig, pipes *Pipes, startCallback StartCallback) (int, error)
Kill(c *Command, sig int) error Kill(c *Command, sig int) error

14
daemon/execdriver/lxc/driver.go
View file

@ -55,7 +55,7 @@ func (d *driver) Name() string {
return fmt.Sprintf("%s-%s", DriverName, version) return fmt.Sprintf("%s-%s", DriverName, version)
} }
func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (*execdriver.ExitStatus, error) { func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (execdriver.ExitStatus, error) {
var ( var (
term execdriver.Terminal term execdriver.Terminal
err error err error
@ -76,11 +76,11 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
}) })
if err := d.generateEnvConfig(c); err != nil { if err := d.generateEnvConfig(c); err != nil {
return nil, err return execdriver.ExitStatus{-1, false}, err
} }
configPath, err := d.generateLXCConfig(c) configPath, err := d.generateLXCConfig(c)
if err != nil { if err != nil {
return nil, err return execdriver.ExitStatus{-1, false}, err
} }
params := []string{ params := []string{
"lxc-start", "lxc-start",
@ -155,11 +155,11 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
c.ProcessConfig.Args = append([]string{name}, arg...) c.ProcessConfig.Args = append([]string{name}, arg...)
if err := nodes.CreateDeviceNodes(c.Rootfs, c.AutoCreatedDevices); err != nil { if err := nodes.CreateDeviceNodes(c.Rootfs, c.AutoCreatedDevices); err != nil {
return nil, err return execdriver.ExitStatus{-1, false}, err
} }
if err := c.ProcessConfig.Start(); err != nil { if err := c.ProcessConfig.Start(); err != nil {
return nil, err return execdriver.ExitStatus{-1, false}, err
} }
var ( var (
@ -183,7 +183,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
c.ProcessConfig.Process.Kill() c.ProcessConfig.Process.Kill()
c.ProcessConfig.Wait() c.ProcessConfig.Wait()
} }
return nil, err return execdriver.ExitStatus{-1, false}, err
} }
c.ContainerPid = pid c.ContainerPid = pid
@ -194,7 +194,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
<-waitLock <-waitLock
return &execdriver.ExitStatus{getExitCode(c), false}, waitErr return execdriver.ExitStatus{getExitCode(c), false}, waitErr
} }
/// Return the exit code of the process /// Return the exit code of the process

34
daemon/execdriver/native/driver.go
View file

@ -70,11 +70,11 @@ type execOutput struct {
err error err error
} }
func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (*execdriver.ExitStatus, error) { func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (execdriver.ExitStatus, error) {
// take the Command and populate the libcontainer.Config from it // take the Command and populate the libcontainer.Config from it
container, err := d.createContainer(c) container, err := d.createContainer(c)
if err != nil { if err != nil {
return nil, err return execdriver.ExitStatus{-1, false}, err
} }
var term execdriver.Terminal var term execdriver.Terminal
@ -85,7 +85,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
term, err = execdriver.NewStdConsole(&c.ProcessConfig, pipes) term, err = execdriver.NewStdConsole(&c.ProcessConfig, pipes)
} }
if err != nil { if err != nil {
return nil, err return execdriver.ExitStatus{-1, false}, err
} }
c.ProcessConfig.Terminal = term c.ProcessConfig.Terminal = term
@ -102,16 +102,16 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
) )
if err := d.createContainerRoot(c.ID); err != nil { if err := d.createContainerRoot(c.ID); err != nil {
return nil, err return execdriver.ExitStatus{-1, false}, err
} }
defer d.cleanContainer(c.ID) defer d.cleanContainer(c.ID)
if err := d.writeContainerFile(container, c.ID); err != nil { if err := d.writeContainerFile(container, c.ID); err != nil {
return nil, err return execdriver.ExitStatus{-1, false}, err
} }
execOutputChan := make(chan execOutput, 0) execOutputChan := make(chan execOutput, 1)
waitForStart := make(chan struct{}, 0) waitForStart := make(chan struct{})
go func() { go func() {
exitCode, err := namespaces.Exec(container, c.ProcessConfig.Stdin, c.ProcessConfig.Stdout, c.ProcessConfig.Stderr, c.ProcessConfig.Console, dataPath, args, func(container *libcontainer.Config, console, dataPath, init string, child *os.File, args []string) *exec.Cmd { exitCode, err := namespaces.Exec(container, c.ProcessConfig.Stdin, c.ProcessConfig.Stdout, c.ProcessConfig.Stderr, c.ProcessConfig.Console, dataPath, args, func(container *libcontainer.Config, console, dataPath, init string, child *os.File, args []string) *exec.Cmd {
@ -146,26 +146,22 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
select { select {
case execOutput := <-execOutputChan: case execOutput := <-execOutputChan:
return &execdriver.ExitStatus{execOutput.exitCode, false}, execOutput.err return execdriver.ExitStatus{execOutput.exitCode, false}, execOutput.err
case <-waitForStart: case <-waitForStart:
break break
} }
oomKill := false oomKill := false
go func() { oomKillNotification, err := d.notifyOnOOM(container)
oomKillNotification, err := d.notifyOnOOM(container) if err == nil {
if err == nil { _, oomKill = <-oomKillNotification
if _, ok := <-oomKillNotification; ok { } else {
oomKill = true log.Warnf("WARNING: Your kernel does not support OOM notifications: %s", err)
} }
} else {
log.Infof("WARNING: Your kernel does not support OOM notifications: %s", err)
}
}()
// wait for the container to exit. // wait for the container to exit.
execOutput := <-execOutputChan execOutput := <-execOutputChan
return &execdriver.ExitStatus{execOutput.exitCode, oomKill}, execOutput.err return execdriver.ExitStatus{execOutput.exitCode, oomKill}, execOutput.err
} }
func (d *driver) Kill(p *execdriver.Command, sig int) error { func (d *driver) Kill(p *execdriver.Command, sig int) error {

12
daemon/monitor.go
View file

@ -100,7 +100,7 @@ func (m *containerMonitor) Close() error {
func (m *containerMonitor) Start() error { func (m *containerMonitor) Start() error {
var ( var (
err error err error
exitStatus *execdriver.ExitStatus exitStatus execdriver.ExitStatus
// this variable indicates where we in execution flow: // this variable indicates where we in execution flow:
// before Run or after // before Run or after
afterRun bool afterRun bool
@ -110,7 +110,7 @@ func (m *containerMonitor) Start() error {
defer func() { defer func() {
if afterRun { if afterRun {
m.container.Lock() m.container.Lock()
m.container.setStopped(exitStatus) m.container.setStopped(&exitStatus)
defer m.container.Unlock() defer m.container.Unlock()
} }
m.Close() m.Close()
@ -138,7 +138,7 @@ func (m *containerMonitor) Start() error {
// if we receive an internal error from the initial start of a container then lets // if we receive an internal error from the initial start of a container then lets
// return it instead of entering the restart loop // return it instead of entering the restart loop
if m.container.RestartCount == 0 { if m.container.RestartCount == 0 {
m.container.ExitCode = exitStatus m.container.ExitCode = -1
m.resetContainer(false) m.resetContainer(false)
return err return err
@ -153,7 +153,7 @@ func (m *containerMonitor) Start() error {
m.resetMonitor(err == nil && exitStatus.ExitCode == 0) m.resetMonitor(err == nil && exitStatus.ExitCode == 0)
if m.shouldRestart(exitStatus.ExitCode) { if m.shouldRestart(exitStatus.ExitCode) {
m.container.SetRestarting(exitStatus) m.container.SetRestarting(&exitStatus)
m.container.LogEvent("die") m.container.LogEvent("die")
m.resetContainer(true) m.resetContainer(true)
@ -164,12 +164,12 @@ func (m *containerMonitor) Start() error {
// we need to check this before reentering the loop because the waitForNextRestart could have // we need to check this before reentering the loop because the waitForNextRestart could have
// been terminated by a request from a user // been terminated by a request from a user
if m.shouldStop { if m.shouldStop {
m.container.ExitCode = exitStatus m.container.ExitCode = exitStatus.ExitCode
return err return err
} }
continue continue
} }
m.container.ExitCode = exitStatus m.container.ExitCode = exitStatus.ExitCode
m.container.LogEvent("die") m.container.LogEvent("die")
m.resetContainer(true) m.resetContainer(true)
return err return err

17
daemon/state.go
View file

@ -31,16 +31,12 @@ func NewState() *State {
// String returns a human-readable description of the state // String returns a human-readable description of the state
func (s *State) String() string { func (s *State) String() string {
oomInfo := ""
if s.OOMKilled {
oomInfo = "possibly due to lack of memory"
}
if s.Running { if s.Running {
if s.Paused { if s.Paused {
return fmt.Sprintf("Up %s (Paused)", units.HumanDuration(time.Now().UTC().Sub(s.StartedAt))) return fmt.Sprintf("Up %s (Paused)", units.HumanDuration(time.Now().UTC().Sub(s.StartedAt)))
} }
if s.Restarting { if s.Restarting {
return fmt.Sprintf("Restarting (%d) %s ago %s", s.ExitCode, units.HumanDuration(time.Now().UTC().Sub(s.FinishedAt)), oomInfo) return fmt.Sprintf("Restarting (%d) %s ago", s.ExitCode, units.HumanDuration(time.Now().UTC().Sub(s.FinishedAt)))
} }
return fmt.Sprintf("Up %s", units.HumanDuration(time.Now().UTC().Sub(s.StartedAt))) return fmt.Sprintf("Up %s", units.HumanDuration(time.Now().UTC().Sub(s.StartedAt)))
@ -50,7 +46,7 @@ func (s *State) String() string {
return "" return ""
} }
return fmt.Sprintf("Exited (%d) %s ago %s", s.ExitCode, units.HumanDuration(time.Now().UTC().Sub(s.FinishedAt)), oomInfo) return fmt.Sprintf("Exited (%d) %s ago", s.ExitCode, units.HumanDuration(time.Now().UTC().Sub(s.FinishedAt)))
} }
// StateString returns a single string to describe state // StateString returns a single string to describe state
@ -167,10 +163,7 @@ func (s *State) setStopped(exitStatus *execdriver.ExitStatus) {
s.Pid = 0 s.Pid = 0
s.FinishedAt = time.Now().UTC() s.FinishedAt = time.Now().UTC()
s.ExitCode = exitStatus.ExitCode s.ExitCode = exitStatus.ExitCode
s.OOMKilled = false s.OOMKilled = exitStatus.OOMKilled
if exitStatus.OOMKilled {
s.OOMKilled = true
}
close(s.waitChan) // fire waiters for stop close(s.waitChan) // fire waiters for stop
s.waitChan = make(chan struct{}) s.waitChan = make(chan struct{})
} }
@ -186,9 +179,7 @@ func (s *State) SetRestarting(exitStatus *execdriver.ExitStatus) {
s.Pid = 0 s.Pid = 0
s.FinishedAt = time.Now().UTC() s.FinishedAt = time.Now().UTC()
s.ExitCode = exitStatus.ExitCode s.ExitCode = exitStatus.ExitCode
if exitStatus.OOMKilled { s.OOMKilled = exitStatus.OOMKilled
s.OOMKilled = true
}
close(s.waitChan) // fire waiters for stop close(s.waitChan) // fire waiters for stop
s.waitChan = make(chan struct{}) s.waitChan = make(chan struct{})
s.Unlock() s.Unlock()