diff options
author | John Cai <jcai@gitlab.com> | 2019-08-19 15:14:15 -0700 |
---|---|---|
committer | John Cai <jcai@gitlab.com> | 2019-08-22 16:12:03 -0700 |
commit | 81552b84ab70661280a0818eec8d9791404daf5b (patch) | |
tree | 8697194c0d07c5ba4ccc5b07fbb65dc37c16fb50 | |
parent | b7f191c5d025f95f5f343f43b24878c68b5c72b3 (diff) | |
download | gitlab-ce-jc-fix-auto-rugged-detection.tar.gz |
Handle when server info doesn't have the storage in questionjc-fix-auto-rugged-detection
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 3 | ||||
-rw-r--r-- | spec/lib/gitlab/gitaly_client_spec.rb | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index e6cbfb00f60..201db9fec26 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -406,7 +406,8 @@ module Gitlab def self.filesystem_id(storage) response = Gitlab::GitalyClient::ServerService.new(storage).info storage_status = response.storage_statuses.find { |status| status.storage_name == storage } - storage_status.filesystem_id + + storage_status&.filesystem_id end def self.filesystem_id_from_disk(storage) diff --git a/spec/lib/gitlab/gitaly_client_spec.rb b/spec/lib/gitlab/gitaly_client_spec.rb index e9fb6c0125c..2637afd289e 100644 --- a/spec/lib/gitlab/gitaly_client_spec.rb +++ b/spec/lib/gitlab/gitaly_client_spec.rb @@ -27,6 +27,16 @@ describe Gitlab::GitalyClient do end end + describe '.filesystem_id' do + it 'returns an empty string when the storage is not found in the response' do + response = double("response") + allow(response).to receive(:storage_statuses).and_return([]) + allow_any_instance_of(Gitlab::GitalyClient::ServerService).to receive(:info).and_return(response) + + expect(described_class.filesystem_id('default')).to eq("") + end + end + describe '.stub_class' do it 'returns the gRPC health check stub' do expect(described_class.stub_class(:health_check)).to eq(::Grpc::Health::V1::Health::Stub) |