Merge pull request #463 from bcwaldon/agent-shutdown-order

fix(agent): Clear UnitState before unscheduling on shutdown
coreos · May 15, 2014 · 20cd7e4 · 20cd7e4
2 parents 4db2af9 + 8ab9f88
commit 20cd7e4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/agent/agent.go b/agent/agent.go
@@ -168,10 +168,10 @@ func (a *Agent) Purge() {
 	machID := a.machine.State().ID
 
 	for _, jobName := range a.state.ScheduledJobs() {
-		log.Infof("Unscheduling Job(%s) from local machine", jobName)
-		a.registry.ClearJobTarget(jobName, machID)
 		log.Infof("Unloading Job(%s) from local machine", jobName)
 		a.UnloadJob(jobName)
+		log.Infof("Unscheduling Job(%s) from local machine", jobName)
+		a.registry.ClearJobTarget(jobName, machID)
 	}
 
 	// Jobs have been stopped, the heartbeat can stop