1 files changed, 10 insertions, 3 deletions
diff --git a/app/models/project_repository_storage_move.rb b/app/models/project_repository_storage_move.rb
index b18d9765a57..2b74d9ccd88 100644
--- a/app/models/project_repository_storage_move.rb
+++ b/app/models/project_repository_storage_move.rb
@@ -29,12 +29,17 @@ class ProjectRepositoryStorageMove < ApplicationRecord
       transition scheduled: :started
     end
 
-    event :finish do
-      transition started: :finished
+    event :finish_replication do
+      transition started: :replicated
+    end
+
+    event :finish_cleanup do
+      transition replicated: :finished
     end
 
     event :do_fail do
       transition [:initial, :scheduled, :started] => :failed
+      transition replicated: :cleanup_failed
     end
 
     after_transition initial: :scheduled do |storage_move|
@@ -49,7 +54,7 @@ class ProjectRepositoryStorageMove < ApplicationRecord
       end
     end
 
-    after_transition started: :finished do |storage_move|
+    after_transition started: :replicated do |storage_move|
       storage_move.project.update_columns(
         repository_read_only: false,
         repository_storage: storage_move.destination_storage_name
@@ -65,6 +70,8 @@ class ProjectRepositoryStorageMove < ApplicationRecord
     state :started, value: 3
     state :finished, value: 4
     state :failed, value: 5
+    state :replicated, value: 6
+    state :cleanup_failed, value: 7
   end
 
   scope :order_created_at_desc, -> { order(created_at: :desc) }