diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-05-16 16:17:55 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-05-17 09:31:50 +0200 |
| commit | 94b209b32c4d38eb7a350c175aff551f789b7c6b (patch) | |
| tree | 43c4dbc3ce04f431a7c4777f73b0deb47781509b /lib | |
| parent | 73289a8361aa6bb2cbd26873ccabe512fca6589b (diff) | |
| download | gitlab-ce-94b209b32c4d38eb7a350c175aff551f789b7c6b.tar.gz | |
Move git archives downloading to Gitaly
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/workhorse.rb | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 061865a7acf..c7a755319dc 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -403,10 +403,10 @@ module Gitlab prefix = archive_prefix(ref, commit.id, append_sha: append_sha) { - 'RepoPath' => path, 'ArchivePrefix' => prefix, 'ArchivePath' => archive_file_path(storage_path, commit.id, prefix, format), - 'CommitId' => commit.id + 'CommitId' => commit.id, + 'GitalyRepository' => gitaly_repository.to_h } end diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 1f060de657d..e893e46ee86 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -65,12 +65,7 @@ module Gitlab params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format, append_sha: append_sha) raise "Repository or ref not found" if params.empty? - if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) - params.merge!( - 'GitalyServer' => gitaly_server_hash(repository), - 'GitalyRepository' => repository.gitaly_repository.to_h - ) - end + params['GitalyServer'] = gitaly_server_hash(repository) # If present DisableCache must be a Boolean. Otherwise workhorse ignores it. params['DisableCache'] = true if git_archive_cache_disabled? |