projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3901-component-rendering-errors
[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 5a571d4a8b6665b98ee6a9d76d9055c99e1c5e34..b157de42fc8130fb8b1a33f694f0bdd71b58c049 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/jobs_controller.rb
@@
-151,19
+151,17
@@
class Arvados::V1::JobsController < ApplicationController
params[:order] ||= ['priority desc', 'created_at']
load_limit_offset_order_params
load_where_param
params[:order] ||= ['priority desc', 'created_at']
load_limit_offset_order_params
load_where_param
- @where.merge!({
- started_at: nil,
- is_locked_by_uuid: nil,
- cancelled_at: nil,
- success: nil
- })
+ @where.merge!({state: Job::Queued})
return if false.equal?(load_filters_param)
find_objects_for_index
index
end
def queue_size
return if false.equal?(load_filters_param)
find_objects_for_index
index
end
def queue_size
- render :json => {:queue_size => Job.queue.size}
+ # Users may not be allowed to see all the jobs in the queue, so provide a
+ # method to get just the queue size in order to get a gist of how busy the
+ # cluster is.
+ render :json => {:queue_size => Job.queue.size}
end
def self._create_requires_parameters
end
def self._create_requires_parameters