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

Don't serialize task states twice in state files

This commit is contained in:
Michael Schurter 2016-09-02 15:41:05 -07:00
parent 6cb6d9cdf1
commit f601361d58
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/alloc_runner.go
View File

@ -77,7 +77,6 @@ type allocRunnerState struct {
Alloc *structs.Allocation
AllocClientStatus string
AllocClientDescription string
TaskStates map[string]*structs.TaskState
Context *driver.ExecContext
}
@ -121,7 +120,7 @@ func (r *AllocRunner) RestoreState() error {
r.ctx = snap.Context
r.allocClientStatus = snap.AllocClientStatus
r.allocClientDescription = snap.AllocClientDescription
r.taskStates = snap.TaskStates
r.taskStates = snap.Alloc.TaskStates
var snapshotErrors multierror.Error
if r.alloc == nil {
@ -189,7 +188,6 @@ func (r *AllocRunner) saveAllocRunnerState() error {
alloc := r.Alloc()
r.allocLock.Lock()
states := alloc.TaskStates
allocClientStatus := r.allocClientStatus
allocClientDescription := r.allocClientDescription
r.allocLock.Unlock()
@ -204,7 +202,6 @@ func (r *AllocRunner) saveAllocRunnerState() error {
Context: ctx,
AllocClientStatus: allocClientStatus,
AllocClientDescription: allocClientDescription,
TaskStates: states,
}
return persistState(r.stateFilePath(), &snap)
}