summaryrefslogtreecommitdiff
path: root/app/models/project_repository_storage_move.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/project_repository_storage_move.rb')
-rw-r--r--app/models/project_repository_storage_move.rb26
1 files changed, 17 insertions, 9 deletions
diff --git a/app/models/project_repository_storage_move.rb b/app/models/project_repository_storage_move.rb
index 76f428fe925..3429dbe3a85 100644
--- a/app/models/project_repository_storage_move.rb
+++ b/app/models/project_repository_storage_move.rb
@@ -46,8 +46,15 @@ class ProjectRepositoryStorageMove < ApplicationRecord
transition replicated: :cleanup_failed
end
- after_transition initial: :scheduled do |storage_move|
- storage_move.project.update_column(:repository_read_only, true)
+ around_transition initial: :scheduled do |storage_move, block|
+ block.call
+
+ begin
+ storage_move.project.set_repository_read_only!
+ rescue => err
+ errors.add(:project, err.message)
+ next false
+ end
storage_move.run_after_commit do
ProjectUpdateRepositoryStorageWorker.perform_async(
@@ -56,17 +63,18 @@ class ProjectRepositoryStorageMove < ApplicationRecord
storage_move.id
)
end
+
+ true
end
- after_transition started: :replicated do |storage_move|
- storage_move.project.update_columns(
- repository_read_only: false,
- repository_storage: storage_move.destination_storage_name
- )
+ before_transition started: :replicated do |storage_move|
+ storage_move.project.set_repository_writable!
+
+ storage_move.project.update_column(:repository_storage, storage_move.destination_storage_name)
end
- after_transition started: :failed do |storage_move|
- storage_move.project.update_column(:repository_read_only, false)
+ before_transition started: :failed do |storage_move|
+ storage_move.project.set_repository_writable!
end
state :initial, value: 1