projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8800-queue-query'
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
jobs_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/jobs_controller.rb
b/services/api/app/controllers/arvados/v1/jobs_controller.rb
index f1ef2d824054f3a0dbe3bb338a966d3a00341b10..0190537e8bd918130e44f4855b713e29cb079099 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/jobs_controller.rb
@@
-143,7
+143,7
@@
class Arvados::V1::JobsController < ApplicationController
end
end
end
end
end
end
- job_queue = Job.queue
+ job_queue = Job.queue
.select(:uuid)
n_queued_before_me = 0
job_queue.each do |j|
break if j.uuid == @job.uuid
n_queued_before_me = 0
job_queue.each do |j|
break if j.uuid == @job.uuid
@@
-152,7
+152,7
@@
class Arvados::V1::JobsController < ApplicationController
yield "#{db_current_time}" \
" job #{@job.uuid}" \
" queue_position #{n_queued_before_me}" \
yield "#{db_current_time}" \
" job #{@job.uuid}" \
" queue_position #{n_queued_before_me}" \
- " queue_size #{job_queue.
size
}" \
+ " queue_size #{job_queue.
count
}" \
" nodes_idle #{nodes_in_state[:idle]}" \
" nodes_alloc #{nodes_in_state[:alloc]}\n"
last_ack_at = db_current_time
" nodes_idle #{nodes_in_state[:idle]}" \
" nodes_alloc #{nodes_in_state[:alloc]}\n"
last_ack_at = db_current_time