[ARVADOS] updated: 2.1.0-1644-geafbd28d0

[Git user]

Summary of changes:
 doc/admin/upgrading.html.textile.liquid        | 4 ++++
 services/api/app/controllers/sys_controller.rb | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

       via  eafbd28d0a866807471951e133a8132dbdfa9cfc (commit)
      from  3134405ebc155a8a51738b7c6d0d4be348c65087 (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 eafbd28d0a866807471951e133a8132dbdfa9cfc
Author: Tom Clegg <tom at curii.com>
Date:   Wed Nov 17 15:49:34 2021 -0500

    18339: Delete previously trashed/zombie role groups.
    
    (Role groups can no longer be trashed, see #18340.)
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index c1a7ae87d..59d41e6c2 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -39,6 +39,10 @@ h2(#main). development main (as of 2021-11-10)
 
 "previous: Upgrading from 2.3.0":#v2_3_0
 
+h3. Previously trashed role groups will be deleted
+
+A bug in previous versions caused role groups to be flagged as trash instead of being deleted by a @DELETE@ operation. After upgrading, any groups that had been trashed this way will be deleted, and future @DELETE@ operations will delete role groups as intended.
+
 h3. Users are visible to other users by default
 
 When a new user is set up (either via @AutoSetupNewUsers@ config or via Workbench admin interface) the user immediately becomes visible to other users. To revert to the previous behavior, where the administrator must add two users to the same group using the Workbench admin interface in order for the users to see each other, change the new @Users.ActivatedUsersAreVisibleToOthers@ config to @false at .
diff --git a/services/api/app/controllers/sys_controller.rb b/services/api/app/controllers/sys_controller.rb
index 08a672cc0..3d434f2d6 100644
--- a/services/api/app/controllers/sys_controller.rb
+++ b/services/api/app/controllers/sys_controller.rb
@@ -17,14 +17,14 @@ class SysController < ApplicationController
         where('is_trashed = false and trash_at < statement_timestamp()').
         update_all('is_trashed = true')
 
-      # Sweep trashed projects and their contents
+      # Sweep trashed projects and their contents (as well as role
+      # groups that were trashed before #18340 when that was
+      # disallowed)
       Group.
-        where({group_class: 'project'}).
         where('delete_at is not null and delete_at < statement_timestamp()').each do |project|
           delete_project_and_contents(project.uuid)
       end
       Group.
-        where({group_class: 'project'}).
         where('is_trashed = false and trash_at < statement_timestamp()').
         update_all('is_trashed = true')
 

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


hooks/post-receive
--