Add retry feature to project import

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Add retry feature to project import
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 37db76a3
Showing 4 changed files with 28 additions and 6 deletions Show diff stats
app/models/project.rb
app/services/projects/create_service.rb
app/workers/repository_import_worker.rb
config/routes.rb
@@ -126,12 +126,18 @@ class Project &lt; 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 &lt; 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
@@ -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,
@@ -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)
@@ -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
...	...	@@ -126,12 +126,18 @@ class Project < ActiveRecord::Base
126	126	end
127	127
128	128	event :import_fail do
129		- transition :started => :timeout
	129	+ transition :started => :failed
	130	+ end
	131	+
	132	+ event :import_retry do
	133	+ transition :failed => :started
130	134	end
131	135
132	136	state :started
133	137	state :finished
134		- state :timeout
	138	+ state :failed
	139	+
	140	+ after_transition any => :started, :do => :add_import_job
135	141	end
136	142
137	143	class << self
...	...	@@ -210,12 +216,28 @@ class Project < ActiveRecord::Base
210	216	id && persisted?
211	217	end
212	218
	219	+ def add_import_job
	220	+ RepositoryImportWorker.perform_in(2.seconds, id)
	221	+ end
	222	+
213	223	def import?
214	224	import_url.present?
215	225	end
216	226
217	227	def imported?
218		- imported
	228	+ import_finished?
	229	+ end
	230	+
	231	+ def import_in_progress?
	232	+ import? && import_status == 'started'
	233	+ end
	234	+
	235	+ def import_failed?
	236	+ import_status == 'failed'
	237	+ end
	238	+
	239	+ def import_finished?
	240	+ import_status == 'finished'
219	241	end
220	242
221	243	def check_limit
...	...
...	...	@@ -62,7 +62,7 @@ module Projects
62	62	@project.update_column(:last_activity_at, @project.created_at)
63	63
64	64	if @project.import?
65		- RepositoryImportWorker.perform_in(5.seconds, @project.id)
	65	+ @project.import_start
66	66	else
67	67	GitlabShellWorker.perform_async(
68	68	:add_repository,
...	...
...	...	@@ -6,8 +6,6 @@ class RepositoryImportWorker
6	6
7	7	def perform(project_id)
8	8	project = Project.find(project_id)
9		- project.import_start
10		-
11	9	result = gitlab_shell.send(:import_repository,
12	10	project.path_with_namespace,
13	11	project.import_url)
...	...
...	...	@@ -179,6 +179,8 @@ Gitlab::Application.routes.draw do
179	179	post :archive
180	180	post :unarchive
181	181	get :autocomplete_sources
	182	+ get :import
	183	+ put :retry_import
182	184	end
183	185
184	186	scope module: :projects do
...	...