From 4f0e5803fdd7aa30dd77c0203f38cbc6a44f3a09 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Mon, 9 Aug 2021 19:03:14 -0400 Subject: [PATCH 1/2] Remove writing of memcached config from evmserver --- app/models/miq_server/environment_management.rb | 15 --------------- lib/workers/evm_server.rb | 2 -- 2 files changed, 17 deletions(-) diff --git a/app/models/miq_server/environment_management.rb b/app/models/miq_server/environment_management.rb index 01e58577662..a0ef4a5cfc1 100644 --- a/app/models/miq_server/environment_management.rb +++ b/app/models/miq_server/environment_management.rb @@ -23,21 +23,6 @@ def get_network_information [ipaddr, hostname, mac_address] end - - def start_memcached - # TODO: Need to periodically check the memcached instance to see if it's up, and bounce it and notify the UiWorkers to re-connect - return unless ::Settings.server.session_store.to_s == 'cache' - return unless MiqEnvironment::Command.supports_memcached? - - require Rails.root.join("lib/miq_memcached").to_s unless Object.const_defined?(:MiqMemcached) - - _svr, port = MiqMemcached.server_address.to_s.split(":") - opts = ::Settings.session.memcache_server_opts.to_s - - MiqMemcached::Control.restart!(:port => port, :options => opts) if MiqMemcached::Config.new(:port => port, :options => opts).changed? - - _log.info("Status: #{MiqMemcached::Control.status[1]}") - end end def disk_usage_threshold diff --git a/lib/workers/evm_server.rb b/lib/workers/evm_server.rb index 37dba6f5199..3e4b42ebe4a 100644 --- a/lib/workers/evm_server.rb +++ b/lib/workers/evm_server.rb @@ -106,8 +106,6 @@ def start_server EvmDatabase.seed_rest - MiqServer.start_memcached - MiqEvent.raise_evm_event(@current_server, "evm_server_start") _log.info("Server starting...") From 77474d4837665b8a6c7c8bd0b2cb04b2c662a81f Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Tue, 17 Aug 2021 14:20:43 -0400 Subject: [PATCH 2/2] Remove memcache_server_opts --- config/settings.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/settings.yml b/config/settings.yml index 02fa2942652..ed2ebffc356 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -988,7 +988,6 @@ :session: :interval: 60 :memcache_server: 127.0.0.1:11211 - :memcache_server_opts: "-l 127.0.0.1 -I 1M" :show_login_info: true :timeout: 3600 :log_threshold: 100.kilobytes