Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Remove wait_for_worker_monitor functionality #14257

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/models/embedded_ansible_worker/runner.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
class EmbeddedAnsibleWorker::Runner < MiqWorker::Runner
self.wait_for_worker_monitor = false

def prepare
ObjectSpace.garbage_collect
# Overriding prepare so we can set started when we're ready
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ class EventCatcherHandledException < StandardError

include DuplicateBlocker

self.wait_for_worker_monitor = false

OPTIONS_PARSER_SETTINGS = ::MiqWorker::Runner::OPTIONS_PARSER_SETTINGS + [
[:ems_id, 'EMS Instance ID', String],
]
Expand Down
2 changes: 0 additions & 2 deletions app/models/miq_ems_refresh_core_worker/runner.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
require 'thread'

class MiqEmsRefreshCoreWorker::Runner < MiqWorker::Runner
self.wait_for_worker_monitor = false

OPTIONS_PARSER_SETTINGS = MiqWorker::Runner::OPTIONS_PARSER_SETTINGS + [
[:ems_id, 'EMS Instance ID', String],
]
Expand Down
1 change: 0 additions & 1 deletion app/models/miq_priority_worker/runner.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
class MiqPriorityWorker::Runner < MiqQueueWorkerBase::Runner
self.wait_for_worker_monitor = false
end
2 changes: 0 additions & 2 deletions app/models/miq_vim_broker_worker/runner.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
class MiqVimBrokerWorker::Runner < MiqWorker::Runner
self.wait_for_worker_monitor = false

def after_initialize
require 'thread'

Expand Down
27 changes: 0 additions & 27 deletions app/models/miq_worker/runner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,6 @@ def set_connection_pool_size
# Worker Monitor Methods
###############################

def self.wait_for_worker_monitor?
@wait_for_worker_monitor = true if @wait_for_worker_monitor.nil?
@wait_for_worker_monitor
end

class << self
attr_writer :wait_for_worker_monitor
end

def my_monitor_started?
return @monitor_started unless @monitor_started.nil?
return false if server.nil?
return false unless server.reload.started?
@monitor_started = true
end

def worker_monitor_drb
@worker_monitor_drb ||= begin
raise _("%{log} No MiqServer found to establishing DRb Connection to") % {:log => log_prefix} if server.nil?
Expand Down Expand Up @@ -152,7 +136,6 @@ def prepare
set_database_application_name
ObjectSpace.garbage_collect
started_worker_record
do_wait_for_worker_monitor if self.class.wait_for_worker_monitor?
do_before_work_loop
self
end
Expand Down Expand Up @@ -324,16 +307,6 @@ def do_work
raise NotImplementedError, _("must be implemented in a subclass")
end

def do_wait_for_worker_monitor
_log.info("#{log_prefix} Checking that worker monitor has started before doing work")
loop do
break if self.my_monitor_started?
heartbeat
sleep 3
end
_log.info("#{log_prefix} Starting work since worker monitor has started")
end

def do_work_loop
warn_about_heartbeat_skipping if skip_heartbeat?
loop do
Expand Down
4 changes: 0 additions & 4 deletions app/models/mixins/miq_web_server_runner_mixin.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
module MiqWebServerRunnerMixin
extend ActiveSupport::Concern

included do
self.wait_for_worker_monitor = false
end

def do_work
end

Expand Down
5 changes: 0 additions & 5 deletions spec/models/miq_ui_worker/runner_spec.rb

This file was deleted.