[arvados] updated: 2.6.0-133-g0f7c52a79

git repository hosting git at public.arvados.org
Fri May 5 17:34:29 UTC 2023


Summary of changes:
 sdk/python/arvados-v1-discovery.json               | 111 ++-------------------
 .../api/app/controllers/application_controller.rb  |  35 ++++++-
 .../arvados/v1/containers_controller.rb            |   8 +-
 .../controllers/arvados/v1/groups_controller.rb    |  26 ++++-
 .../controllers/arvados/v1/schema_controller.rb    |   2 +-
 .../app/controllers/arvados/v1/users_controller.rb |   9 +-
 services/api/app/models/group.rb                   |   1 +
 .../arvados/v1/groups_controller_test.rb           |  32 ++++++
 .../arvados/v1/schema_controller_test.rb           |   2 +-
 9 files changed, 114 insertions(+), 112 deletions(-)

       via  0f7c52a790a95484c4358251937ad4105abc5071 (commit)
       via  9d3ace1fdba783134eb5557a9b28f8132df552de (commit)
       via  e3c25b992f96b34810c371aa75e30ba8ce40a639 (commit)
       via  2c854a99434c76e0165543bedfe9e97a1fe81ae8 (commit)
       via  e0f045ddedd05716bd813f801654308d3bbd2dd0 (commit)
       via  ff843a40de882d22dd2a5e408c77a2fa4720cc7d (commit)
       via  385d9ac5f47bec5c5a5fc9770c74b1a7d8dd2974 (commit)
       via  f4e3341d2857114e8c3ea0a7941ff8429491dd59 (commit)
      from  58e057254087f406ca4146da7031187487b0ddbc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0f7c52a790a95484c4358251937ad4105abc5071
Merge: 58e057254 9d3ace1fd
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri May 5 13:33:57 2023 -0400

    Merge branch '20470-contents-select' refs #20470
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --cc services/api/app/controllers/arvados/v1/containers_controller.rb
index ceb40348b,acb61c6e6..17970ce4c
--- a/services/api/app/controllers/arvados/v1/containers_controller.rb
+++ b/services/api/app/controllers/arvados/v1/containers_controller.rb
@@@ -51,10 -50,17 +51,16 @@@ class Arvados::V1::ContainersControlle
      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, :lock_count)
-       @select = %w(uuid state priority auth_uuid locked_by_uuid)
+       # This gets called from within find_object_by_uuid.
+       # find_object_by_uuid stores the original value of @select in
+       # @preserve_select, edits the value of @select, calls
+       # find_objects_for_index, then restores @select from the value
+       # of @preserve_select.  So if we want our updated value of
+       # @select here to stick, we have to set @preserve_select.
+       @select = @preserve_select = %w(uuid state priority auth_uuid locked_by_uuid)
      elsif action_name == 'update_priority'
 -      # We're going to reload(lock: true) in the handler, which will
 -      # select all attributes, but will fail if we don't select :id
 -      # now.
 +      # We're going to reload in update_priority!, which will select
 +      # all attributes, but will fail if we don't select :id now.
        @objects = @objects.select(:id, :uuid)
      end
    end

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list