Remove temporary_ignore_server_unavailable_errors config

- this temporary config flag was used to ignore server unavailable errors coming back from log-cache (or metric-proxy in cf-for-k8s) - given the change proposed in #2227 to rescue more errors and serve partial stats responses this config is no longer necessary Authored-by: Tim Downey <[email protected]>
cloudfoundry · Apr 29, 2021 · 2abeb94 · 2abeb94
1 parent 37e1003
commit 2abeb94
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 17 deletions.
diff --git a/config/cloud_controller.yml b/config/cloud_controller.yml
@@ -102,7 +102,6 @@ loggregator:
 logcache:
   host: 'http://doppler.service.cf.internal'
   port: 8080
-  temporary_ignore_server_unavailable_errors: false
 
 logcache_tls:
   key_file: 'spec/fixtures/certs/log_cache.key'

diff --git a/lib/cloud_controller/config_schemas/base/api_schema.rb b/lib/cloud_controller/config_schemas/base/api_schema.rb
@@ -205,7 +205,6 @@ class ApiSchema < VCAP::Config
             logcache: {
               host: String,
               port: Integer,
-              temporary_ignore_server_unavailable_errors: bool,
             },
 
             optional(:logcache_tls) => {

diff --git a/lib/cloud_controller/dependency_locator.rb b/lib/cloud_controller/dependency_locator.rb
@@ -526,7 +526,6 @@ def build_logcache_client
         client_cert_path: config.get(:logcache_tls, :cert_file),
         client_key_path: config.get(:logcache_tls, :key_file),
         tls_subject_name: config.get(:logcache_tls, :subject_name),
-        temporary_ignore_server_unavailable_errors: config.get(:logcache, :temporary_ignore_server_unavailable_errors)
       )
     end
 

diff --git a/lib/logcache/client.rb b/lib/logcache/client.rb
@@ -6,7 +6,7 @@ class Client
     MAX_LIMIT = 1000
     DEFAULT_LIMIT = 100
 
-    def initialize(host:, port:, client_ca_path:, client_cert_path:, client_key_path:, tls_subject_name:, temporary_ignore_server_unavailable_errors:)
+    def initialize(host:, port:, client_ca_path:, client_cert_path:, client_key_path:, tls_subject_name:)
       if client_ca_path
         client_ca = IO.read(client_ca_path)
         client_key = IO.read(client_key_path)
@@ -25,8 +25,6 @@ def initialize(host:, port:, client_ca_path:, client_cert_path:, client_key_path
           timeout: 250
         )
       end
-
-      @temporary_ignore_server_unavailable_errors = temporary_ignore_server_unavailable_errors
     end
 
     def container_metrics(source_guid:, envelope_limit: DEFAULT_LIMIT, start_time:, end_time:)

diff --git a/spec/logcache/client_spec.rb b/spec/logcache/client_spec.rb
@@ -21,8 +21,7 @@ module Logcache
       let(:channel_arg_hash) { { GRPC::Core::Channel::SSL_TARGET => tls_subject_name } }
       let(:client) do
         Logcache::Client.new(host: host, port: port, client_ca_path: client_ca_path,
-                             client_cert_path: client_cert_path, client_key_path: client_key_path, tls_subject_name: tls_subject_name,
-                             temporary_ignore_server_unavailable_errors: false)
+                             client_cert_path: client_cert_path, client_key_path: client_key_path, tls_subject_name: tls_subject_name)
       end
       let(:client_ca) { File.open(client_ca_path).read }
       let(:client_key) { File.open(client_key_path).read }
@@ -78,8 +77,7 @@ module Logcache
 
         let(:client) do
           Logcache::Client.new(host: host, port: port, client_ca_path: client_ca_path,
-                               client_cert_path: client_cert_path, client_key_path: client_key_path, tls_subject_name: tls_subject_name,
-                               temporary_ignore_server_unavailable_errors: false)
+                               client_cert_path: client_cert_path, client_key_path: client_key_path, tls_subject_name: tls_subject_name)
         end
 
         it 'retries the request three times and raises an exception' do
@@ -110,8 +108,7 @@ module Logcache
 
         let(:client) do
           Logcache::Client.new(host: host, port: port, client_ca_path: client_ca_path,
-                               client_cert_path: client_cert_path, client_key_path: client_key_path, tls_subject_name: tls_subject_name,
-                               temporary_ignore_server_unavailable_errors: false)
+                               client_cert_path: client_cert_path, client_key_path: client_key_path, tls_subject_name: tls_subject_name)
         end
 
         it 'raises an exception' do
@@ -150,8 +147,14 @@ module Logcache
 
     describe 'without TLS' do
       let(:client) do
-        Logcache::Client.new(host: host, port: port, temporary_ignore_server_unavailable_errors: false,
-                            client_ca_path: nil, client_cert_path: nil, client_key_path: nil, tls_subject_name: nil)
+        Logcache::Client.new(
+          host: host,
+          port: port,
+          client_ca_path: nil,
+          client_cert_path: nil,
+          client_key_path: nil,
+          tls_subject_name: nil
+        )
       end
 
       describe '#container_metrics' do

diff --git a/spec/unit/lib/cloud_controller/dependency_locator_spec.rb b/spec/unit/lib/cloud_controller/dependency_locator_spec.rb
@@ -503,7 +503,6 @@
         client_cert_path: nil,
         client_key_path: nil,
         tls_subject_name: nil,
-        temporary_ignore_server_unavailable_errors: false
       )
     end
 
@@ -513,7 +512,6 @@
           logcache: {
             host: 'some-logcache-host',
             port: 1234,
-            temporary_ignore_server_unavailable_errors: false,
           },
           logcache_tls: {
             ca_file: 'logcache-ca',
@@ -531,7 +529,6 @@
         client_cert_path: 'logcache-client-ca',
         client_key_path: 'logcache-client-key',
         tls_subject_name: 'some-tls-cert-san',
-        temporary_ignore_server_unavailable_errors: false
       )
     end
   end