Merge branch 'master' into 2257-inequality-conditions

[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 05f884917eb6e7a2d17e649d4018a7d3fbf52a11..a715d0ef29d8117dea8de020af6084234af2e52d 100644 (file)
--- a/services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb
@@ -3,8 +3,10 @@ class Arvados::V1::JobsController < ApplicationController
   accept_attribute_as_json :runtime_constraints, Hash
   accept_attribute_as_json :tasks_summary, Hash
   skip_before_filter :find_object_by_uuid, :only => :queue
+  skip_before_filter :render_404_if_no_object, :only => :queue
 
   def index
+    return super unless @where.is_a? Hash
     want_ancestor = @where[:script_version_descends_from]
     if want_ancestor
       # Check for missing commit_ancestor rows, and create them if
@@ -41,6 +43,7 @@ class Arvados::V1::JobsController < ApplicationController
   end
 
   def cancel
+    reload_object_before_update
     @object.update_attributes cancelled_at: Time.now
     show
   end
@@ -116,7 +119,7 @@ class Arvados::V1::JobsController < ApplicationController
 
   def self._log_tail_follow_requires_parameters
     {
-      buffer_size: {type: 'integer', required: false}
+      buffer_size: {type: 'integer', required: false, default: 2**13}
     }
   end
   def log_tail_follow