Skip to content

Do not swallow RunTimeoutError while collecting facts #643

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

Open
silug wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

Do not swallow RunTimeoutError while collecting facts #643

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
6 changes: 5 additions & 1 deletion lib/puppet/configurer/fact_handler.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true

require_relative '../../puppet/agent'
require_relative '../../puppet/indirector/facts/facter'

require_relative '../../puppet/configurer'
Expand All @@ -20,7 +21,10 @@ def find_facts
facts.name = Puppet[:node_name_value]
end
facts
rescue SystemExit, NoMemoryError
rescue SystemExit, NoMemoryError, Puppet::Agent::RunTimeoutError
# RunTimeoutError means the agent run as a whole has exceeded `runtimeout`.
# Let it propagate so the run is aborted instead of wrapping it in a
# Puppet::Error and carrying on with the rest of the run.
raise
rescue Exception => detail
message = _("Could not retrieve local facts: %{detail}") % { detail: detail }
Expand Down
7 changes: 7 additions & 0 deletions spec/unit/configurer/fact_handler_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ def reload_facter
expect { facthandler.find_facts }.to raise_error(Puppet::Error, /Could not retrieve local facts/)
end

it "should re-raise RunTimeoutError so the agent run is aborted" do
expect(Puppet::Node::Facts.indirection).to receive(:find).and_raise(Puppet::Agent::RunTimeoutError, 'execution expired')
expect(Puppet).not_to receive(:log_exception)

expect { facthandler.find_facts }.to raise_error(Puppet::Agent::RunTimeoutError, 'execution expired')
end

it "should only load fact plugins once" do
expect(Puppet::Node::Facts.indirection).to receive(:find).once
facthandler.find_facts
Expand Down