luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

rawexec: fix race around h.procState

Browse source
This commit is contained in:
Michael Schurter 2018-10-30 17:15:47 -07:00
parent ac12ae1729
commit 616801417c
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/rawexec/handle.go
View file

@ -27,19 +27,25 @@ type rawExecTaskHandle struct {
}
func (h *rawExecTaskHandle) IsRunning() bool {
h.stateLock.RLock()
defer h.stateLock.RUnlock()
return h.procState == drivers.TaskStateRunning
}
func (h *rawExecTaskHandle) run() {
// since run is called immediately after the handle is created this
// Since run is called immediately after the handle is created this
// ensures the exitResult is initialized so we avoid a nil pointer
// thus it does not need to be included in the lock
// thus it does not need to be included in the lock.
h.stateLock.Lock()
if h.exitResult == nil {
h.exitResult = &drivers.ExitResult{}
}
h.stateLock.Unlock()
// Block until process exits
ps, err := h.exec.Wait()
h.stateLock.Lock()
defer h.stateLock.Unlock()