diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-02-15 23:50:05 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-02-15 23:56:40 -0800 |
| commit | 6606a45030ecd4035b095d33d32f1372c3562b02 (patch) | |
| tree | e6d27e8d3e9d55e1e21d46d74934bc987041533c /app/services/groups | |
| parent | e90ec73f651ca6153a72437d4dd01f60c38839da (diff) | |
| download | gitlab-ce-6606a45030ecd4035b095d33d32f1372c3562b02.tar.gz | |
Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projects
There are two problems in the current implementation:
1. If a project is marked for deletion via the `pending_delete` flag
and then the namespace was quickly deleted, it's possible that the
namespace skips over that project and leaves that project in
an orphaned state.
2. Before namespace deletion, the namespace attempts to clean up
all the relevant storage paths. However, if all projects have been
removed synchronously, then the namespace will not be able to clean anything.
To prevent this, we should load the paths to be deleted before
actually destroying projects.
The specs were missing this second case due to a permission issue
that caused project removal never to happen.
Diffstat (limited to 'app/services/groups')
| -rw-r--r-- | app/services/groups/destroy_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb index 7f2d28086f5..2e2d7f884ac 100644 --- a/app/services/groups/destroy_service.rb +++ b/app/services/groups/destroy_service.rb @@ -8,7 +8,9 @@ module Groups end def execute - group.projects.each do |project| + group.prepare_for_destroy + + group.projects.with_deleted.each do |project| # Execute the destruction of the models immediately to ensure atomic cleanup. # Skip repository removal because we remove directory with namespace # that contain all these repositories |