diff options
| author | John Cai <jcai@gitlab.com> | 2019-07-09 09:38:03 -0700 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-07-09 10:25:07 -0700 |
| commit | f883a19df6356e96d285344afe8ac6ef8c1318e9 (patch) | |
| tree | cf6556a02cf030a43eea67803e94aea754e5d201 | |
| parent | db1b15e4245547a4468ab70d337a73a40d4fc98c (diff) | |
| download | gitlab-ce-jc-disable-can-use-disk-temp.tar.gz | |
Disabling can_use_disk? temporarilyjc-disable-can-use-disk-temp
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index cf0157269a8..dfb896db1da 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -388,6 +388,7 @@ module Gitlab end def self.can_use_disk?(storage) + return false cached_value = MUTEX.synchronize do @can_use_disk ||= {} @can_use_disk[storage] diff --git a/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb b/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb index f957ed00945..e7ef9d08f80 100644 --- a/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb +++ b/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb @@ -30,6 +30,7 @@ describe Gitlab::Git::RuggedImpl::UseRugged, :seed_helper do end it 'returns true when gitaly matches disk' do + pending('temporary disabled because of https://gitlab.com/gitlab-org/gitlab-ce/issues/64338') expect(subject.use_rugged?(repository, feature_flag_name)).to be true end @@ -48,6 +49,7 @@ describe Gitlab::Git::RuggedImpl::UseRugged, :seed_helper do end it "doesn't lead to a second rpc call because gitaly client should use the cached value" do + pending('temporary disabled because of https://gitlab.com/gitlab-org/gitlab-ce/issues/64338') expect(subject.use_rugged?(repository, feature_flag_name)).to be true expect(Gitlab::GitalyClient).not_to receive(:filesystem_id) |