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

Call ResetFailedUnit when cleaning up failed services #20810

Merged
merged 1 commit into from
Nov 19, 2020
+7 −3
Merged

Call ResetFailedUnit when cleaning up failed services #20810

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
1 change: 1 addition & 0 deletions app/models/miq_server/worker_management/monitor/systemd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def systemd_manager
def systemd_stop_services(service_names)
service_names.each do |service_name|
systemd_manager.StopUnit(service_name, "replace")
systemd_manager.ResetFailedUnit(service_name)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WIP because I want to confirm that this order is correct, (stop, reset, disable)

Copy link
Member Author

@agrare agrare Nov 18, 2020 •
edited by chessbyte
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay taking out of WIP, tested this live on an appliance by kill -9'ing a worker and the failed systemd service is properly cleaned up


service_settings_dir = systemd_unit_dir.join("#{service_name}.d")
FileUtils.rm_r(service_settings_dir) if service_settings_dir.exist?
Expand Down
9 changes: 6 additions & 3 deletions spec/models/miq_server/worker_management/monitor/systemd_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
end

context "with failed services" do
let(:units) { [{:name => "[email protected]", :description => "ManageIQ Generic Worker", :load_state => "loaded", :active_state => "failed", :sub_state => "plugged", :job_id => 0, :job_type => "", :job_object_path => "/"}] }
let(:service_name) { "[email protected]" }
let(:units) { [{:name => service_name, :description => "ManageIQ Generic Worker", :load_state => "loaded", :active_state => "failed", :sub_state => "plugged", :job_id => 0, :job_type => "", :job_object_path => "/"}] }

it "calls DisableUnitFiles with the service name" do
expect(systemd_manager).to receive(:StopUnit).with("[email protected]", "replace")
expect(systemd_manager).to receive(:DisableUnitFiles).with(["[email protected]"], false)
expect(systemd_manager).to receive(:StopUnit).with(service_name, "replace")
expect(systemd_manager).to receive(:ResetFailedUnit).with(service_name)
expect(systemd_manager).to receive(:DisableUnitFiles).with([service_name], false)

server.cleanup_failed_systemd_services
end
end
Expand Down