From b47646ef13597836cad342a4d9372316289f0155 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 12 Mar 2014 19:26:09 +0200
Subject: [PATCH] Add retry feature to project import

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/project.rb                   | 28 ++++++++++++++++++++++---
 app/services/projects/create_service.rb |  2 +-
 app/workers/repository_import_worker.rb |  2 --
 config/routes.rb                        |  2 ++
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 90c33822568..c2ba21ac7e9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -126,12 +126,18 @@ class Project < ActiveRecord::Base
     end
 
     event :import_fail do
-      transition :started => :timeout
+      transition :started => :failed
+    end
+
+    event :import_retry do
+      transition :failed => :started
     end
 
     state :started
     state :finished
-    state :timeout
+    state :failed
+
+    after_transition any => :started, :do => :add_import_job
   end
 
   class << self
@@ -210,12 +216,28 @@ class Project < ActiveRecord::Base
     id && persisted?
   end
 
+  def add_import_job
+    RepositoryImportWorker.perform_in(2.seconds, id)
+  end
+
   def import?
     import_url.present?
   end
 
   def imported?
-    imported
+    import_finished?
+  end
+
+  def import_in_progress?
+    import? && import_status == 'started'
+  end
+
+  def import_failed?
+    import_status == 'failed'
+  end
+
+  def import_finished?
+    import_status == 'finished'
   end
 
   def check_limit
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index b3f97a7c9c1..4d3d518a509 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -62,7 +62,7 @@ module Projects
         @project.update_column(:last_activity_at, @project.created_at)
 
         if @project.import?
-          RepositoryImportWorker.perform_in(5.seconds, @project.id)
+          @project.import_start
         else
           GitlabShellWorker.perform_async(
             :add_repository,
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index c577cb0273f..e66df8c4db1 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -6,8 +6,6 @@ class RepositoryImportWorker
 
   def perform(project_id)
     project = Project.find(project_id)
-    project.import_start
-
     result = gitlab_shell.send(:import_repository,
                                project.path_with_namespace,
                                project.import_url)
diff --git a/config/routes.rb b/config/routes.rb
index fdca1e62661..628d1f631bc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -179,6 +179,8 @@ Gitlab::Application.routes.draw do
       post :archive
       post :unarchive
       get :autocomplete_sources
+      get :import
+      put :retry_import
     end
 
     scope module: :projects do