diff options
author | Stan Hu <stanhu@gmail.com> | 2016-05-28 19:54:17 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-08-11 15:36:35 -0700 |
commit | cb8a425ba42e9be23b8712ed29b1db2dcc6bd139 (patch) | |
tree | 632b9c50748615409e6318176706a67a1fd05bab /app/controllers/groups_controller.rb | |
parent | d4f987b2861ecec75b06d5efc2ad59e31a383337 (diff) | |
download | gitlab-ce-cb8a425ba42e9be23b8712ed29b1db2dcc6bd139.tar.gz |
Fix bug where destroying a namespace would not always destroy projects
There is a race condition in DestroyGroupService now that projects are deleted asynchronously:
1. User attempts to delete group
2. DestroyGroupService iterates through all projects and schedules a Sidekiq job to delete each Project
3. DestroyGroupService destroys the Group, leaving all its projects without a namespace
4. Projects::DestroyService runs later but the can?(current_user,
:remove_project) is `false` because the user no longer has permission to
destroy projects with no namespace.
5. This leaves the project in pending_delete state with no namespace/group.
Projects without a namespace or group also adds another problem: it's not possible to destroy the container
registry tags, since container_registry_path_with_namespace is the wrong value.
The fix is to destroy the group asynchronously and to run execute directly on Projects::DestroyService.
Closes #17893
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r-- | app/controllers/groups_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 6780a6d4d87..cb82d62616c 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -87,9 +87,9 @@ class GroupsController < Groups::ApplicationController end def destroy - DestroyGroupService.new(@group, current_user).execute + DestroyGroupService.new(@group, current_user).async_execute - redirect_to root_path, alert: "Group '#{@group.name}' was successfully deleted." + redirect_to root_path, alert: "Group '#{@group.name}' was scheduled for deletion." end protected |