Add MiqWorkerType model

app/models/manageiq/providers/base_manager/event_catcher.rb

@@ -15,4 +15,8 @@ def friendly_name
  end
  end
  end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_EVENT_CATCHERS
+ end
 end

app/models/manageiq/providers/base_manager/metrics_collector_worker.rb

@@ -14,4 +14,8 @@ def self.supports_container?
  def self.normalized_type
  @normalized_type ||= "ems_metrics_collector_worker"
  end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_METRICS_COLLECTOR_WORKERS
+ end
 end

app/models/manageiq/providers/base_manager/operations_worker.rb

@@ -3,7 +3,7 @@ class ManageIQ::Providers::BaseManager::OperationsWorker < MiqQueueWorkerBase
 
  include PerEmsWorkerMixin
 
- self.required_roles = "ems_operations"
+ self.required_roles = %w[ems_operations]
 
  def friendly_name
  @friendly_name ||= begin

app/models/manageiq/providers/base_manager/refresh_worker.rb

@@ -5,7 +5,7 @@ class ManageIQ::Providers::BaseManager::RefreshWorker < MiqQueueWorkerBase
 
  # Don't allow multiple refresh workers to run at once
  self.include_stopping_workers_on_synchronize = true
- self.required_roles = "ems_inventory"
+ self.required_roles = %w[ems_inventory]
 
  def friendly_name
  @friendly_name ||= begin
@@ -21,4 +21,8 @@ def friendly_name
  def self.normalized_type
  @normalized_type ||= "ems_refresh_worker"
  end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_REFRESH_WORKERS
+ end
 end

app/models/miq_cockpit_ws_worker.rb

@@ -9,6 +9,10 @@ def friendly_name
  @friendly_name ||= "Cockpit Worker"
  end
 
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_COCKPIT_WS_WORKERS
+ end
+
  def self.can_start_cockpit_ws?
  @supports_cockpit_ws ||= MiqCockpit::WS.can_start_cockpit_ws?
  end

app/models/miq_ems_metrics_processor_worker.rb

@@ -13,4 +13,8 @@ def friendly_name
  def self.supports_container?
  true
  end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_METRICS_PROCESSOR_WORKERS
+ end
 end

app/models/miq_event_handler.rb

@@ -9,4 +9,8 @@ class MiqEventHandler < MiqQueueWorkerBase
  def self.supports_container?
  true
  end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_EVENT_HANDLERS
+ end
 end

app/models/miq_generic_worker.rb

@@ -10,4 +10,8 @@ class MiqGenericWorker < MiqQueueWorkerBase
  def self.supports_container?
  true
  end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_GENERIC_WORKERS
+ end
 end

app/models/miq_priority_worker.rb

@@ -12,4 +12,8 @@ def self.queue_priority
  def self.supports_container?
  true
  end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_PRIORITY_WORKERS
+ end
 end

app/models/miq_remote_console_worker.rb

@@ -16,4 +16,8 @@ def friendly_name
  def self.supports_container?
  true
  end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_REMOTE_CONSOLE_WORKERS
+ end
 end

app/models/miq_reporting_worker.rb

@@ -9,4 +9,8 @@ class MiqReportingWorker < MiqQueueWorkerBase
  def self.supports_container?
  true
  end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_REPORTING_WORKERS
+ end
 end

app/models/miq_schedule_worker.rb

@@ -13,4 +13,8 @@ class MiqScheduleWorker < MiqWorker
  def self.supports_container?
  true
  end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_SCHEDULE_WORKERS
+ end
 end

app/models/miq_server/worker_management/monitor.rb

@@ -1,7 +1,6 @@
 module MiqServer::WorkerManagement::Monitor
  extend ActiveSupport::Concern
 
- include_concern 'ClassNames'
  include_concern 'Kill'
  include_concern 'Quiesce'
  include_concern 'Reason'
@@ -25,7 +24,7 @@ def monitor_workers
 
  processed_worker_ids = []
 
- self.class.monitor_class_names.each do |class_name|
+ MiqWorkerType.worker_class_names.each do |class_name|
  processed_worker_ids += check_not_responding(class_name)
  processed_worker_ids += check_pending_stop(class_name)
  processed_worker_ids += clean_worker_records(class_name)
@@ -47,7 +46,7 @@ def worker_not_responding(w)
 
  def sync_workers
  result = {}
- self.class.monitor_class_names.each do |class_name|
+ MiqWorkerType.worker_class_names.each do |class_name|
  begin
  c = class_name.constantize
  raise NameError, "Constant problem: expected: #{class_name}, constantized: #{c.name}" unless c.name == class_name
@@ -115,7 +114,7 @@ def monitor_reason_not_responding?(w)
  end
 
  def do_system_limit_exceeded
- self.class.monitor_class_names_in_kill_order.each do |class_name|
+ MiqWorkerType.worker_class_names_in_kill_order.each do |class_name|
  workers = class_name.constantize.find_current.to_a
  next if workers.empty?
 

app/models/miq_server/worker_management/monitor/quiesce.rb

@@ -5,7 +5,7 @@ def workers_quiesced?
  # do a subset of the monitor_workers loop to allow for graceful exit
  heartbeat
 
- self.class.monitor_class_names.each do |class_name|
+ MiqWorkerType.worker_class_names.each do |class_name|
  check_not_responding(class_name)
  check_pending_stop(class_name)
  clean_worker_records(class_name)

app/models/miq_server/worker_management/monitor/settings.rb

@@ -8,7 +8,7 @@ module MiqServer::WorkerManagement::Monitor::Settings
 
  def sync_child_worker_settings
  @child_worker_settings = {}
- self.class.monitor_class_names.each do |class_name|
+ MiqWorkerType.worker_class_names.each do |class_name|
  c = class_name.constantize
  @child_worker_settings[c.settings_name] = c.worker_settings
  end

app/models/miq_server/worker_management/monitor/start.rb

@@ -10,7 +10,7 @@ def wait_for_started_workers
  entered_wait_for_started_loop = Time.now.utc
  wait_for_started_timeout = @worker_monitor_settings[:wait_for_started_timeout] || 10.minutes
  loop do
- starting = MiqWorker.find_starting.find_all { |w| self.class.monitor_class_names.include?(w.class.name) }
+ starting = MiqWorker.find_starting.find_all { |w| MiqWorkerType.worker_class_names.include?(w.class.name) }
  if starting.empty?
  _log.info("All workers have been started")
  break

app/models/miq_smart_proxy_worker.rb

@@ -3,4 +3,8 @@ class MiqSmartProxyWorker < MiqQueueWorkerBase
 
  self.required_roles = ["smartproxy"]
  self.default_queue_name = "smartproxy"
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_SMART_PROXY_WORKERS
+ end
 end

app/models/miq_ui_worker.rb

@@ -26,6 +26,14 @@ def self.supports_container?
  true
  end
 
+ def self.bundler_groups
+ %w[manageiq_default ui_dependencies graphql_api]
+ end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_UI_WORKERS
+ end
+
  def container_port
  3001
  end

app/models/miq_web_service_worker.rb

@@ -15,4 +15,12 @@ def friendly_name
  def self.supports_container?
  true
  end
+
+ def self.bundler_groups
+ %w[manageiq_default graphql_api]
+ end
+
+ def self.kill_priority
+ MiqWorkerType::KILL_PRIORITY_WEB_SERVICE_WORKERS
+ end
 end

app/models/miq_worker.rb

@@ -46,6 +46,14 @@ class << self
  attr_writer :workers
  end
 
+ def self.bundler_groups
+ %w[manageiq_default]
+ end
+
+ def self.kill_priority
+ raise NotImplementedError, ".kill_priority must be implemented in a subclass"
+ end
+
  def self.workers
  return (self.has_minimal_env_option? ? 1 : 0) if MiqServer.minimal_env? && check_for_minimal_role
  return 0 unless has_required_role?

app/models/miq_worker_type.rb

@@ -0,0 +1,54 @@
+class MiqWorkerType < ApplicationRecord
+ EXCLUDED_CLASS_NAMES = %w[ManageIQ::Providers::BaseManager::OperationsWorker].freeze
+
+ KILL_PRIORITY_METRICS_PROCESSOR_WORKERS = 10
+ KILL_PRIORITY_METRICS_COLLECTOR_WORKERS = 20
+ KILL_PRIORITY_REPORTING_WORKERS = 30
+ KILL_PRIORITY_SMART_PROXY_WORKERS = 40
+ KILL_PRIORITY_GENERIC_WORKERS = 50
+ KILL_PRIORITY_EVENT_HANDLERS = 60
+ KILL_PRIORITY_REFRESH_WORKERS = 70
+ KILL_PRIORITY_SCHEDULE_WORKERS = 80
+ KILL_PRIORITY_PRIORITY_WORKERS = 90
+ KILL_PRIORITY_WEB_SERVICE_WORKERS = 100
+ KILL_PRIORITY_REFRESH_CORE_WORKERS = 110
+ KILL_PRIORITY_VIM_BROKER_WORKERS = 120
+ KILL_PRIORITY_EVENT_CATCHERS = 130
+ KILL_PRIORITY_UI_WORKERS = 140
+ KILL_PRIORITY_REMOTE_CONSOLE_WORKERS = 150
+ KILL_PRIORITY_COCKPIT_WS_WORKERS = 160
+
+ scope :in_kill_order, -> { order(:kill_priority => :asc) }
+
+ def self.seed
+ transaction do
+ clean_worker_types
+ classes_for_seed.each { |klass| seed_worker(klass) }
+ end
+ end
+
+ def self.worker_class_names
+ pluck(:worker_type)
+ end
+
+ def self.worker_class_names_in_kill_order
+ in_kill_order.pluck(:worker_type)
+ end
+
+ private_class_method def self.classes_for_seed
+ @classes_for_seed ||= MiqWorker.descendants.select { |w| w.subclasses.empty? } - EXCLUDED_CLASS_NAMES.map(&:constantize)
+ end
+
+ private_class_method def self.seed_worker(klass)
+ instance = find_or_initialize_by(:worker_type => klass.name)
+
+ instance.update!(
+ :bundler_groups => klass.bundler_groups,
+ :kill_priority => klass.kill_priority
+ )
+ end
+
+ private_class_method def self.clean_worker_types
+ where.not(:worker_type => classes_for_seed.map(&:to_s)).destroy_all
+ end
+end

config/replication_exclude_tables.yml

@@ -74,6 +74,7 @@
 - miq_user_roles
 - miq_widgets
 - miq_widget_contents
+- miq_worker_types
 - miq_workers
 - notifications
 - notification_recipients

lib/evm_database.rb

@@ -9,6 +9,7 @@ class EvmDatabase
  Zone
  MiqServer
  ServerRole
+ MiqWorkerType
  Tenant
  MiqProductFeature
  MiqUserRole

lib/generators/manageiq/provider/provider_generator.rb

@@ -42,12 +42,6 @@ def create_dummy
  template "app/models/%plugin_path%/inventory/persister/cloud_manager.rb"
  template "app/models/%plugin_path%/inventory/persister.rb"
  template "app/models/%plugin_path%/cloud_manager.rb"
-
- inject_into_file Rails.root.join('lib/workers/miq_worker_types.rb'), <<~RB.indent(2), :after => "MIQ_WORKER_TYPES = {\n"
- "#{class_name}::CloudManager::EventCatcher" => %i(manageiq_default),
- "#{class_name}::CloudManager::MetricsCollectorWorker" => %i(manageiq_default),
- "#{class_name}::CloudManager::RefreshWorker" => %i(manageiq_default),
- RB
  end
 
  def create_vcr

lib/workers/bin/run_single_worker.rb

@@ -60,27 +60,27 @@ def all_role_names
 opt_parser.parse!
 worker_class = ARGV[0]
 
-require File.expand_path("../miq_worker_types", __dir__)
+require File.expand_path("../../../config/environment", __dir__)
 
 if options[:list]
- puts ::MIQ_WORKER_TYPES.keys
+ puts MiqWorkerType.pluck(:worker_type)
  exit
 end
 opt_parser.abort(opt_parser.help) unless worker_class
 
-unless ::MIQ_WORKER_TYPES.keys.include?(worker_class)
+worker_type = MiqWorkerType.find_by(:worker_type => worker_class)
+
+unless worker_type
  STDERR.puts "ERR: `#{worker_class}` WORKER CLASS NOT FOUND! Please run with `-l` to see possible worker class names."
  exit 1
 end
 
 # Skip heartbeating with single worker
 ENV["DISABLE_MIQ_WORKER_HEARTBEAT"] ||= options[:heartbeat] ? nil : '1'
-ENV["BUNDLER_GROUPS"] = MIQ_WORKER_TYPES[worker_class].join(',')
+ENV["BUNDLER_GROUPS"] = worker_type.bundler_groups.join(',')
 
 options[:ems_id] ||= ENV["EMS_ID"]
 
-require File.expand_path("../../../config/environment", __dir__)
-
 if options[:roles].present?
  MiqServer.my_server.server_role_names += options[:roles]
  MiqServer.my_server.activate_roles(MiqServer.my_server.server_role_names)