From 53a0ac47344b9b1d93ec36d9e6b41e2394598beb Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 3 Jun 2015 16:16:27 +0200
Subject: Skip repo removing whem remove user or group

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/namespace.rb                     | 12 +++++---
 app/services/delete_user_service.rb         |  5 ++--
 app/services/destroy_group_service.rb       |  5 ++--
 app/services/projects/destroy_service.rb    |  8 ++++--
 spec/services/destroy_group_service_spec.rb | 44 +++++++++++++++++++++++++++++
 5 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 spec/services/destroy_group_service_spec.rb

diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 8918e4a682e..03d2ab165ea 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -102,11 +102,15 @@ class Namespace < ActiveRecord::Base
     # Move namespace directory into trash.
     # We will remove it later async
     new_path = "#{path}+#{id}+deleted"
-    gitlab_shell.mv_namespace(path, new_path)
 
-    # Remove namespace directroy async with delay so
-    # GitLab has time to remove all projects first
-    GitlabShellWorker.perform_in(5.minutes, :rm_namespace, new_path)
+    if gitlab_shell.mv_namespace(path, new_path)
+      message = "Namespace directory \"#{path}\" moved to \"#{new_path}\""
+      Gitlab::AppLogger.info message
+
+      # Remove namespace directroy async with delay so
+      # GitLab has time to remove all projects first
+      GitlabShellWorker.perform_in(5.minutes, :rm_namespace, new_path)
+    end
   end
 
   def move_dir
diff --git a/app/services/delete_user_service.rb b/app/services/delete_user_service.rb
index ca350eb2a8d..9017a63af3b 100644
--- a/app/services/delete_user_service.rb
+++ b/app/services/delete_user_service.rb
@@ -4,9 +4,10 @@ class DeleteUserService
       user.errors[:base] << 'You must transfer ownership or delete groups before you can remove user'
       user
     else
-      # TODO: Skip remove repository so Namespace#rm_dir works
       user.personal_projects.each do |project|
-        ::Projects::DestroyService.new(project, current_user, {}).execute
+        # Skip repository removal because we remove directory with namespace
+        # that contain all this repositories
+        ::Projects::DestroyService.new(project, current_user, skip_repo: true).execute
       end
 
       user.destroy
diff --git a/app/services/destroy_group_service.rb b/app/services/destroy_group_service.rb
index c1add7b92e8..d929a676293 100644
--- a/app/services/destroy_group_service.rb
+++ b/app/services/destroy_group_service.rb
@@ -6,9 +6,10 @@ class DestroyGroupService
   end
 
   def execute
-    # TODO: Skip remove repository so Namespace#rm_dir works
     @group.projects.each do |project|
-      ::Projects::DestroyService.new(project, current_user, {}).execute
+      # Skip repository removal because we remove directory with namespace
+      # that contain all this repositories
+      ::Projects::DestroyService.new(project, current_user, skip_repo: true).execute
     end
 
     @group.destroy
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 29e8ba347d4..403f419ec50 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -36,9 +36,11 @@ module Projects
     private
 
     def remove_repository(path)
-      unless gitlab_shell.exists?(path + '.git')
-        return true
-      end
+      # Skip repository removal. We use this flag when remove user or group
+      return true if params[:skip_repo] == true
+
+      # There is a possibility project does not have repository or wiki
+      return true unless gitlab_shell.exists?(path + '.git')
 
       new_path = removal_path(path)
 
diff --git a/spec/services/destroy_group_service_spec.rb b/spec/services/destroy_group_service_spec.rb
new file mode 100644
index 00000000000..24e439503e7
--- /dev/null
+++ b/spec/services/destroy_group_service_spec.rb
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe DestroyGroupService do
+  let!(:user) { create(:user) }
+  let!(:group) { create(:group) }
+  let!(:project) { create(:project, namespace: group) }
+  let!(:gitlab_shell) { Gitlab::Shell.new }
+  let!(:remove_path) { group.path + "+#{group.id}+deleted" }
+
+  context 'database records' do
+    before do
+      destroy_group(group, user)
+    end
+
+    it { Group.all.should_not include(group) }
+    it { Project.all.should_not include(project) }
+  end
+
+  context 'file system' do
+    context 'Sidekiq inline' do
+      before do
+        # Run sidekiq immediatly to check that renamed dir will be removed
+        Sidekiq::Testing.inline! { destroy_group(group, user) }
+      end
+
+      it { gitlab_shell.exists?(group.path).should be_falsey }
+      it { gitlab_shell.exists?(remove_path).should be_falsey }
+    end
+
+    context 'Sidekiq fake' do
+      before do
+        # Dont run sidekiq to check if renamed repository exists
+        Sidekiq::Testing.fake! { destroy_group(group, user) }
+      end
+
+      it { gitlab_shell.exists?(group.path).should be_falsey }
+      it { gitlab_shell.exists?(remove_path).should be_truthy }
+    end
+  end
+
+  def destroy_group(group, user)
+    DestroyGroupService.new(group, user).execute
+  end
+end
-- 
cgit v1.2.1