Remove Git circuit breaker

Was introduced in the time that GitLab still used NFS, which is not
required anymore in most cases. By removing this, the API it calls will
return empty responses. This interface has to be removed in the next
major release, expected to be 12.0.

2 files changed, 6 insertions, 19 deletions

diff --git a/spec/requests/api/circuit_breakers_spec.rb b/spec/requests/api/circuit_breakers_spec.rb
index fe76f057115..6c7cb151c74 100644
--- a/spec/requests/api/circuit_breakers_spec.rb
+++ b/spec/requests/api/circuit_breakers_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe API::CircuitBreakers do
-  let(:user) { create(:user) }
-  let(:admin) { create(:admin) }
+  set(:user) { create(:user) }
+  set(:admin) { create(:admin) }
 
   describe 'GET circuit_breakers/repository_storage' do
     it 'returns a 401 for anonymous users' do
@@ -18,37 +18,26 @@ describe API::CircuitBreakers do
     end
 
     it 'returns an Array of storages' do
-      expect(Gitlab::Git::Storage::Health).to receive(:for_all_storages) do
-        [Gitlab::Git::Storage::Health.new('broken', [{ name: 'prefix:broken:web01', failure_count: 4 }])]
-      end
-
       get api('/circuit_breakers/repository_storage', admin)
 
       expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_kind_of(Array)
-      expect(json_response.first['storage_name']).to eq('broken')
-      expect(json_response.first['failing_on_hosts']).to eq(['web01'])
-      expect(json_response.first['total_failures']).to eq(4)
+      expect(json_response).to be_empty
     end
 
     describe 'GET circuit_breakers/repository_storage/failing' do
       it 'returns an array of failing storages' do
-        expect(Gitlab::Git::Storage::Health).to receive(:for_failing_storages) do
-          [Gitlab::Git::Storage::Health.new('broken', [{ name: 'prefix:broken:web01', failure_count: 4 }])]
-        end
-
         get api('/circuit_breakers/repository_storage/failing', admin)
 
         expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_kind_of(Array)
+        expect(json_response).to be_empty
       end
     end
   end
 
   describe 'DELETE circuit_breakers/repository_storage' do
     it 'clears all circuit_breakers' do
-      expect(Gitlab::Git::Storage::FailureInfo).to receive(:reset_all!)
-
       delete api('/circuit_breakers/repository_storage', admin)
 
       expect(response).to have_gitlab_http_status(204)
diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb
index e379bd9785a..fb1be16a111 100644
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
@@ -2,11 +2,12 @@ require 'spec_helper'
 
 describe API::Settings, 'Settings' do
   let(:user) { create(:user) }
-  let(:admin) { create(:admin) }
+  set(:admin) { create(:admin) }
 
   describe "GET /application/settings" do
     it "returns application settings" do
       get api("/application/settings", admin)
+
       expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Hash
       expect(json_response['default_projects_limit']).to eq(42)
@@ -23,7 +24,6 @@ describe API::Settings, 'Settings' do
       expect(json_response['dsa_key_restriction']).to eq(0)
       expect(json_response['ecdsa_key_restriction']).to eq(0)
       expect(json_response['ed25519_key_restriction']).to eq(0)
-      expect(json_response['circuitbreaker_failure_count_threshold']).not_to be_nil
       expect(json_response['performance_bar_allowed_group_id']).to be_nil
       expect(json_response['instance_statistics_visibility_private']).to be(false)
       expect(json_response).not_to have_key('performance_bar_allowed_group_path')
@@ -62,7 +62,6 @@ describe API::Settings, 'Settings' do
           dsa_key_restriction: 2048,
           ecdsa_key_restriction: 384,
           ed25519_key_restriction: 256,
-          circuitbreaker_check_interval: 2,
           enforce_terms: true,
           terms: 'Hello world!',
           performance_bar_allowed_group_path: group.full_path,
@@ -88,7 +87,6 @@ describe API::Settings, 'Settings' do
         expect(json_response['dsa_key_restriction']).to eq(2048)
         expect(json_response['ecdsa_key_restriction']).to eq(384)
         expect(json_response['ed25519_key_restriction']).to eq(256)
-        expect(json_response['circuitbreaker_check_interval']).to eq(2)
         expect(json_response['enforce_terms']).to be(true)
         expect(json_response['terms']).to eq('Hello world!')
         expect(json_response['performance_bar_allowed_group_id']).to eq(group.id)