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

Merge pull request #319 from mlaventure/harmonize-event-status-type

Browse source 
Use uint32 as Event's Status type everywhere
This commit is contained in:
Michael Crosby 2016-09-19 13:16:35 -07:00 committed by GitHub
commit 0eccb0d224
6 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
runtime/process.go
View file

@ -36,7 +36,7 @@ type Process interface {
ExitFD() int
// ExitStatus returns the exit status of the process or an error if it
// has not exited
ExitStatus() (int, error)
ExitStatus() (uint32, error)
// Spec returns the process spec that created the process
Spec() specs.ProcessSpec
// Signal sends the provided signal to the process
@ -228,31 +228,31 @@ func (p *process) Resize(w, h int) error {
return err
}
func (p *process) updateExitStatusFile(status int) (int, error) {
func (p *process) updateExitStatusFile(status uint32) (uint32, error) {
p.stateLock.Lock()
p.state = Stopped
p.stateLock.Unlock()
err := ioutil.WriteFile(filepath.Join(p.root, ExitStatusFile), []byte(fmt.Sprintf("%d", status)), 0644)
err := ioutil.WriteFile(filepath.Join(p.root, ExitStatusFile), []byte(fmt.Sprintf("%u", status)), 0644)
return status, err
}
func (p *process) handleSigkilledShim(rst int, rerr error) (int, error) {
func (p *process) handleSigkilledShim(rst uint32, rerr error) (uint32, error) {
if p.cmd == nil || p.cmd.Process == nil {
e := unix.Kill(p.pid, 0)
if e == syscall.ESRCH {
logrus.Warnf("containerd: %s:%s (pid %d) does not exist", p.container.id, p.id, p.pid)
// The process died while containerd was down (probably of
// SIGKILL, but no way to be sure)
return p.updateExitStatusFile(255)
return p.updateExitStatusFile(UnknownStatus)
}
// If it's not the same process, just mark it stopped and set
// the status to 255
// the status to the UnknownStatus value (i.e. 255)
if same, err := p.isSameProcess(); !same {
logrus.Warnf("containerd: %s:%s (pid %d) is not the same process anymore (%v)", p.container.id, p.id, p.pid, err)
// Create the file so we get the exit event generated once monitor kicks in
// without having to go through all this process again
return p.updateExitStatusFile(255)
return p.updateExitStatusFile(UnknownStatus)
}
ppid, err := readProcStatField(p.pid, 4)
@ -263,7 +263,7 @@ func (p *process) handleSigkilledShim(rst int, rerr error) (int, error) {
logrus.Warnf("containerd: %s:%s shim died, killing associated process", p.container.id, p.id)
unix.Kill(p.pid, syscall.SIGKILL)
if err != nil && err != syscall.ESRCH {
return 255, fmt.Errorf("containerd: unable to SIGKILL %s:%s (pid %v): %v", p.container.id, p.id, p.pid, err)
return UnknownStatus, fmt.Errorf("containerd: unable to SIGKILL %s:%s (pid %v): %v", p.container.id, p.id, p.pid, err)
}
// wait for the process to die
@ -276,7 +276,7 @@ func (p *process) handleSigkilledShim(rst int, rerr error) (int, error) {
}
// Create the file so we get the exit event generated once monitor kicks in
// without having to go through all this process again
return p.updateExitStatusFile(128 + int(syscall.SIGKILL))
return p.updateExitStatusFile(128 + uint32(syscall.SIGKILL))
}
return rst, rerr
@ -296,7 +296,7 @@ func (p *process) handleSigkilledShim(rst int, rerr error) (int, error) {
logrus.Debugf("containerd: ExitStatus(container: %s, process: %s): shim was SIGKILL'ed reaping its child with pid %d", p.container.id, p.id, p.pid)
rerr = nil
rst = 128 + int(shimStatus.Signal())
rst = 128 + uint32(shimStatus.Signal())
p.stateLock.Lock()
p.state = Stopped
@ -306,7 +306,7 @@ func (p *process) handleSigkilledShim(rst int, rerr error) (int, error) {
return rst, rerr
}
func (p *process) ExitStatus() (rst int, rerr error) {
func (p *process) ExitStatus() (rst uint32, rerr error) {
data, err := ioutil.ReadFile(filepath.Join(p.root, ExitStatusFile))
defer func() {
if rerr != nil {
@ -315,17 +315,19 @@ func (p *process) ExitStatus() (rst int, rerr error) {
}()
if err != nil {
if os.IsNotExist(err) {
return -1, ErrProcessNotExited
return UnknownStatus, ErrProcessNotExited
}
return -1, err
return UnknownStatus, err
}
if len(data) == 0 {
return -1, ErrProcessNotExited
return UnknownStatus, ErrProcessNotExited
}
p.stateLock.Lock()
p.state = Stopped
p.stateLock.Unlock()
return strconv.Atoi(string(data))
i, err := strconv.ParseUint(string(data), 10, 32)
return uint32(i), err
}
func (p *process) Spec() specs.ProcessSpec {

4
runtime/runtime.go
View file

@ -47,6 +47,10 @@ const (
// StartTimeFile holds the name of the file in which the process
// start time is saved
StartTimeFile = "starttime"
// UnknownStatus is the value returned when a process exit
// status cannot be determined
UnknownStatus = 255
)
// Checkpoint holds information regarding a container checkpoint

2
supervisor/delete.go
View file

@ -11,7 +11,7 @@ import (
type DeleteTask struct {
baseTask
ID string
Status int
Status uint32
PID string
NoEvent bool
Process runtime.Process

2
supervisor/exit.go
View file

@ -63,7 +63,7 @@ type ExecExitTask struct {
baseTask
ID string
PID string
Status int
Status uint32
Process runtime.Process
}

4
supervisor/sort_test.go
View file

@ -46,8 +46,8 @@ func (p *testProcess) ExitFD() int {
return -1
}
func (p *testProcess) ExitStatus() (int, error) {
return -1, nil
func (p *testProcess) ExitStatus() (uint32, error) {
return runtime.UnknownStatus, nil
}
func (p *testProcess) Container() runtime.Container {

2
supervisor/supervisor.go
View file

@ -186,7 +186,7 @@ type Event struct {
Type string `json:"type"`
Timestamp time.Time `json:"timestamp"`
PID string `json:"pid,omitempty"`
Status int `json:"status,omitempty"`
Status uint32 `json:"status,omitempty"`
}
// Events returns an event channel that external consumers can use to receive updates