Merge branch 'fix/rc-migration-failure' into 'master'

Fix migration failing when user has no projects

See merge request !8589

db/migrate/20161226122833_remove_dot_git_from_usernames.rb

@@ -14,9 +14,11 @@ class RemoveDotGitFromUsernames < ActiveRecord::Migration
       namespace_id = user['namespace_id']
       path_was = user['username']
       path_was_wildcard = quote_string("#{path_was}/%")
+      path = quote_string(new_path(path_was))
 
-      path = move_namespace(namespace_id, path_was, path)
+      move_namespace(namespace_id, path_was, path)
 
+      begin
         execute "UPDATE routes SET path = '#{path}' WHERE source_type = 'Namespace' AND source_id = #{namespace_id}"
         execute "UPDATE namespaces SET path = '#{path}' WHERE id = #{namespace_id}"
         execute "UPDATE users SET username = '#{path}' WHERE id = #{id}"
@@ -25,6 +27,13 @@ class RemoveDotGitFromUsernames < ActiveRecord::Migration
           new_path = "#{path}/#{route['path'].split('/').last}"
           execute "UPDATE routes SET path = '#{new_path}' WHERE id = #{route['id']}"
         end
+      rescue => e
+        say("Couldn't update routes for path #{path_was} to #{path}")
+        # Move namespace back
+        move_namespace(namespace_id, path, path_was)
+
+        raise e
+      end
     end
   end
 
@@ -44,23 +53,30 @@ class RemoveDotGitFromUsernames < ActiveRecord::Migration
     select_all("SELECT id, path FROM routes WHERE path = '#{quote_string(path)}'").present?
   end
 
-  def path_exists?(repository_storage_path, path)
-    gitlab_shell.exists?(repository_storage_path, path)
+  def path_exists?(path, repository_storage_path)
+    repository_storage_path && gitlab_shell.exists?(repository_storage_path, path)
   end
 
   # Accepts invalid path like test.git and returns test_git or
   # test_git1 if test_git already taken
-  def rename_path(repository_storage_path, path)
+  def new_path(path)
     # To stay closer with original name and reduce risk of duplicates
     # we rename suffix instead of removing it
     path = path.sub(/\.git\z/, '_git')
 
-    counter = 0
-    base = path
+    check_routes(path.dup, 0, path)
+  end
+
+  def check_routes(base, counter, path)
+    route_exists = route_exists?(path)
 
-    while route_exists?(path) || path_exists?(repository_storage_path, path)
+    Gitlab.config.repositories.storages.each_value do |storage|
+      if route_exists || path_exists?(path, storage)
         counter += 1
         path = "#{base}#{counter}"
+
+        return check_route(base, counter, path)
+      end
     end
 
     path
@@ -76,8 +92,6 @@ class RemoveDotGitFromUsernames < ActiveRecord::Migration
       # Ensure old directory exists before moving it
       gitlab_shell.add_namespace(repository_storage_path, path_was)
 
-      path = quote_string(rename_path(repository_storage_path, path_was))
-
       unless gitlab_shell.mv_namespace(repository_storage_path, path_was, path)
         Rails.logger.error "Exception moving path #{repository_storage_path} from #{path_was} to #{path}"
 
@@ -87,8 +101,14 @@ class RemoveDotGitFromUsernames < ActiveRecord::Migration
       end
     end
 
+    begin
       Gitlab::UploadsTransfer.new.rename_namespace(path_was, path)
-
-    path
+    rescue => e
+      if path.nil?
+        say("Couldn't find a storage path for #{namespace_id}, #{path_was} -- skipping")
+      else
+        raise e
+      end
+    end
   end
 end