more missing pieces

jmmcatee · Oct 3, 2019 · 28d34b3 · 28d34b3
1 parent 4d71ef5
commit 28d34b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/common/queue/queue.go b/common/queue/queue.go
@@ -1033,9 +1033,7 @@ func (q *Queue) keeper() {
 													}
 												} else {
 													// Job has been started so mark the hardware as in use and assign the resource ID
-													if retJob.Status == STATUS_RUNNING {
-														q.pool[resKey].Hardware[hardwareKey] = false
-													}
+													q.pool[resKey].Hardware[hardwareKey] = false
 
 													log.WithFields(log.Fields{
 														"uuid":   retJob.UUID,
@@ -1096,9 +1094,7 @@ func (q *Queue) keeper() {
 															}
 														} else {
 															// Job has been started so mark the hardware as in use
-															if retJob.Status == STATUS_RUNNING {
-																q.pool[resKey].Hardware[hardwareKey] = false
-															}
+															q.pool[resKey].Hardware[hardwareKey] = false
 
 															log.WithFields(log.Fields{
 																"uuid":   retJob.UUID,

diff --git a/common/resource/resource.go b/common/resource/resource.go
@@ -270,6 +270,8 @@ func (q *Queue) TaskDone(rpc common.RPCCall, j *common.Job) error {
 
 	common.CopyJob(q.stack[rpc.Job.UUID].Status(), j)
 
+	q.stack[rpc.Job.UUID].Done()
+
 	// Delete the specific job
 	delete(q.stack, rpc.Job.UUID)