projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3899-crunch-use-job-state' closes #3899
[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 d8ceb850f8a7c0dc7e1290b4b39f66f48961671b..b157de42fc8130fb8b1a33f694f0bdd71b58c049 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/jobs_controller.rb
@@
-151,12
+151,7
@@
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
return if false.equal?(load_filters_param)
find_objects_for_index
index