Merge branch 'zj-namespace-gitaly-opt-out' into 'master'
Move Namespace to Gitaly using OPT-OUT See merge request gitlab-org/gitlab-ce!15910
This commit is contained in:
commit
2d3867d096
1 changed files with 8 additions and 4 deletions
|
@ -294,7 +294,8 @@ module Gitlab
|
|||
# add_namespace("/path/to/storage", "gitlab")
|
||||
#
|
||||
def add_namespace(storage, name)
|
||||
Gitlab::GitalyClient.migrate(:add_namespace) do |enabled|
|
||||
Gitlab::GitalyClient.migrate(:add_namespace,
|
||||
status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |enabled|
|
||||
if enabled
|
||||
gitaly_namespace_client(storage).add(name)
|
||||
else
|
||||
|
@ -315,7 +316,8 @@ module Gitlab
|
|||
# rm_namespace("/path/to/storage", "gitlab")
|
||||
#
|
||||
def rm_namespace(storage, name)
|
||||
Gitlab::GitalyClient.migrate(:remove_namespace) do |enabled|
|
||||
Gitlab::GitalyClient.migrate(:remove_namespace,
|
||||
status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |enabled|
|
||||
if enabled
|
||||
gitaly_namespace_client(storage).remove(name)
|
||||
else
|
||||
|
@ -333,7 +335,8 @@ module Gitlab
|
|||
# mv_namespace("/path/to/storage", "gitlab", "gitlabhq")
|
||||
#
|
||||
def mv_namespace(storage, old_name, new_name)
|
||||
Gitlab::GitalyClient.migrate(:rename_namespace) do |enabled|
|
||||
Gitlab::GitalyClient.migrate(:rename_namespace,
|
||||
status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |enabled|
|
||||
if enabled
|
||||
gitaly_namespace_client(storage).rename(old_name, new_name)
|
||||
else
|
||||
|
@ -368,7 +371,8 @@ module Gitlab
|
|||
#
|
||||
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/385
|
||||
def exists?(storage, dir_name)
|
||||
Gitlab::GitalyClient.migrate(:namespace_exists) do |enabled|
|
||||
Gitlab::GitalyClient.migrate(:namespace_exists,
|
||||
status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |enabled|
|
||||
if enabled
|
||||
gitaly_namespace_client(storage).exists?(dir_name)
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue