1 files changed, 45 insertions, 26 deletions

diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index f96ee69096d..3f25e463412 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -25,27 +25,28 @@ module Gitlab
           RepoPath: repo_path
         }
 
-        if Gitlab.config.gitaly.enabled
-          server = {
-            address: Gitlab::GitalyClient.address(project.repository_storage),
-            token: Gitlab::GitalyClient.token(project.repository_storage)
-          }
-          params[:Repository] = repository.gitaly_repository.to_h
-
-          feature_enabled = case action.to_s
-                            when 'git_receive_pack'
-                              Gitlab::GitalyClient.feature_enabled?(:post_receive_pack)
-                            when 'git_upload_pack'
-                              Gitlab::GitalyClient.feature_enabled?(:post_upload_pack)
-                            when 'info_refs'
-                              true
-                            else
-                              raise "Unsupported action: #{action}"
-                            end
-          if feature_enabled
-            params[:GitalyAddress] = server[:address] # This field will be deprecated
-            params[:GitalyServer] = server
-          end
+        server = {
+          address: Gitlab::GitalyClient.address(project.repository_storage),
+          token: Gitlab::GitalyClient.token(project.repository_storage)
+        }
+        params[:Repository] = repository.gitaly_repository.to_h
+
+        feature_enabled = case action.to_s
+                          when 'git_receive_pack'
+                            Gitlab::GitalyClient.feature_enabled?(:post_receive_pack)
+                          when 'git_upload_pack'
+                            Gitlab::GitalyClient.feature_enabled?(
+                              :post_upload_pack,
+                              status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT
+                            )
+                          when 'info_refs'
+                            true
+                          else
+                            raise "Unsupported action: #{action}"
+                          end
+        if feature_enabled
+          params[:GitalyAddress] = server[:address] # This field will be deprecated
+          params[:GitalyServer] = server
         end
 
         params
@@ -64,10 +65,21 @@ module Gitlab
       end
 
       def send_git_blob(repository, blob)
-        params = {
-          'RepoPath' => repository.path_to_repo,
-          'BlobId' => blob.id
-        }
+        params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show)
+                   {
+                     'GitalyServer' => gitaly_server_hash(repository),
+                     'GetBlobRequest' => {
+                       repository: repository.gitaly_repository.to_h,
+                       oid: blob.id,
+                       limit: -1
+                     }
+                   }
+                 else
+                   {
+                     'RepoPath' => repository.path_to_repo,
+                     'BlobId' => blob.id
+                   }
+                 end
 
         [
           SEND_DATA_HEADER,
@@ -178,7 +190,7 @@ module Gitlab
       end
 
       def set_key_and_notify(key, value, expire: nil, overwrite: true)
-        Gitlab::Redis.with do |redis|
+        Gitlab::Redis::Queues.with do |redis|
           result = redis.set(key, value, ex: expire, nx: !overwrite)
           if result
             redis.publish(NOTIFICATION_CHANNEL, "#{key}=#{value}")
@@ -194,6 +206,13 @@ module Gitlab
       def encode(hash)
         Base64.urlsafe_encode64(JSON.dump(hash))
       end
+
+      def gitaly_server_hash(repository)
+        {
+          address: Gitlab::GitalyClient.address(repository.project.repository_storage),
+          token: Gitlab::GitalyClient.token(repository.project.repository_storage)
+        }
+      end
     end
   end
 end