Migrate Git::Repository#write_ref to Gitaly
This commit is contained in:
parent
44edd1111f
commit
10fb904d63
3 changed files with 34 additions and 4 deletions
|
@ -255,6 +255,8 @@ class Repository
|
|||
|
||||
# This will still fail if the file is corrupted (e.g. 0 bytes)
|
||||
raw_repository.write_ref(keep_around_ref_name(sha), sha, shell: false)
|
||||
rescue Gitlab::Git::CommandError => ex
|
||||
Rails.logger.error "Unable to create keep-around reference for repository #{path}: #{ex}"
|
||||
end
|
||||
|
||||
def kept_around?(sha)
|
||||
|
|
|
@ -1105,10 +1105,14 @@ module Gitlab
|
|||
end
|
||||
|
||||
def write_ref(ref_path, ref, old_ref: nil, shell: true)
|
||||
if shell
|
||||
shell_write_ref(ref_path, ref, old_ref)
|
||||
else
|
||||
rugged_write_ref(ref_path, ref)
|
||||
ref_path = "#{Gitlab::Git::BRANCH_REF_PREFIX}#{ref_path}" unless ref_path.start_with?("refs/") || ref_path == "HEAD"
|
||||
|
||||
gitaly_migrate(:write_ref) do |is_enabled|
|
||||
if is_enabled
|
||||
gitaly_repository_client.write_ref(ref_path, ref, old_ref, shell)
|
||||
else
|
||||
local_write_ref(ref_path, ref, old_ref: old_ref, shell: shell)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -1419,6 +1423,14 @@ module Gitlab
|
|||
|
||||
private
|
||||
|
||||
def local_write_ref(ref_path, ref, old_ref: nil, shell: true)
|
||||
if shell
|
||||
shell_write_ref(ref_path, ref, old_ref)
|
||||
else
|
||||
rugged_write_ref(ref_path, ref)
|
||||
end
|
||||
end
|
||||
|
||||
def shell_write_ref(ref_path, ref, old_ref)
|
||||
raise ArgumentError, "invalid ref_path #{ref_path.inspect}" if ref_path.include?(' ')
|
||||
raise ArgumentError, "invalid ref #{ref.inspect}" if ref.include?("\x00")
|
||||
|
|
|
@ -203,6 +203,22 @@ module Gitlab
|
|||
timeout: GitalyClient.default_timeout
|
||||
)
|
||||
end
|
||||
|
||||
def write_ref(ref_path, ref, old_ref, shell)
|
||||
request = Gitaly::WriteRefRequest.new(
|
||||
repository: @gitaly_repo,
|
||||
ref: ref_path.b,
|
||||
revision: ref.b,
|
||||
shell: shell
|
||||
)
|
||||
request.old_revision = old_ref.b unless old_ref.nil?
|
||||
|
||||
response = GitalyClient.call(@storage, :repository_service, :write_ref, request)
|
||||
|
||||
raise Gitlab::Git::CommandError, encode!(response.error) if response.error.present?
|
||||
|
||||
true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue