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.

Sign up for GitHub

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

[JANSA] Cockpit is a monitor thread and is not a pod worker. #20823 jansa backport #20827

Merged
merged 1 commit into from
Nov 19, 2020
Merged

[JANSA] Cockpit is a monitor thread and is not a pod worker. #20823 jansa backport #20827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion app/models/miq_server/worker_management/monitor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ def cleanup_orphaned_worker_rows
# Hack for schema-less backport(no new system_uid column):
# reuse existing guid column to store/retrieve the system_uid, pod name in pods.
# https://github.com/ManageIQ/manageiq/pull/20792
orphaned_rows = miq_workers.where.not(:guid => current_pods.keys)
#
# Cockpit is a threaded worker in the orchestrator that spins off a process it monitors and isn't a pod worker.
orphaned_rows = miq_workers.where.not(:type => %w[MiqCockpitWsWorker]).where.not(:guid => current_pods.keys)
unless orphaned_rows.empty?
_log.warn("Removing orphaned worker rows without corresponding pods: #{orphaned_rows.collect(&:guid).inspect}")
orphaned_rows.destroy_all
Expand Down
6 changes: 6 additions & 0 deletions spec/models/miq_server/worker_management/monitor_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@
server.cleanup_orphaned_worker_rows
expect(MiqWorker.count).to eq(2)
end

it "skips MiqCockpitWsWorker rows" do
worker.update(:guid => "an_actual_guid", :type => "MiqCockpitWsWorker")
server.cleanup_orphaned_worker_rows
expect(MiqCockpitWsWorker.count).to eq(1)
end
end
end

Expand Down