projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16470: Adds an explicit reload before every pending with_lock call.
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
containers_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/containers_controller.rb
b/services/api/app/controllers/arvados/v1/containers_controller.rb
index 8542096ce1aae27ee4ffe927c7b11f0bc9a4ea11..b2324a57124cf4fb807820641694de8f53bfb51e 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/containers_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/containers_controller.rb
@@
-10,8
+10,8
@@
class Arvados::V1::ContainersController < ApplicationController
accept_attribute_as_json :command, Array
accept_attribute_as_json :scheduling_parameters, Hash
accept_attribute_as_json :command, Array
accept_attribute_as_json :scheduling_parameters, Hash
- skip_before_
filter
:find_object_by_uuid, only: [:current]
- skip_before_
filter
:render_404_if_no_object, only: [:current]
+ skip_before_
action
:find_object_by_uuid, only: [:current]
+ skip_before_
action
:render_404_if_no_object, only: [:current]
def auth
if @object.locked_by_uuid != Thread.current[:api_client_authorization].uuid
def auth
if @object.locked_by_uuid != Thread.current[:api_client_authorization].uuid
@@
-29,8
+29,7
@@
class Arvados::V1::ContainersController < ApplicationController
end
def update
end
def update
- @object.with_lock do
- @object.reload
+ @object.reload.with_lock do
super
end
end
super
end
end
@@
-39,7
+38,7
@@
class Arvados::V1::ContainersController < ApplicationController
super
if action_name == 'lock' || action_name == 'unlock'
# Avoid loading more fields than we need
super
if action_name == 'lock' || action_name == 'unlock'
# Avoid loading more fields than we need
- @objects = @objects.select(:id, :uuid, :state, :priority, :auth_uuid, :locked_by_uuid)
+ @objects = @objects.select(:id, :uuid, :state, :priority, :auth_uuid, :locked_by_uuid
, :lock_count
)
@select = %w(uuid state priority auth_uuid locked_by_uuid)
end
end
@select = %w(uuid state priority auth_uuid locked_by_uuid)
end
end