diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-21 10:08:58 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-21 10:08:58 +0300 |
| commit | b113330fab21d3da547cbee057b825f2225676c6 (patch) | |
| tree | 096eb2abe4ffb0392fd35bcce49a1fc3ecda3690 /lib/gitlab | |
| parent | 338979701b8de0ad6a3d78f7da1d51fe960896cc (diff) | |
| parent | 94b209b32c4d38eb7a350c175aff551f789b7c6b (diff) | |
Merge branch 'zj-workhorse-archive-mandatory' into 'master'
Move git archives downloading to Gitaly
See merge request gitlab-org/gitlab-ce!18990
Diffstat (limited to 'lib/gitlab')
| -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 c02d431bc34..2be604a5b13 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? |