ENT-13720: Suppress spurious validation error log on SIGTERM (3.24.x)#6135
Merged
Merged
Conversation
When a daemon aborts cf-promises during shutdown, ShellCommandReturnsZero() returns false. Skip the "Policy failed validation" error log in that case so it doesn't pollute daemon output (and fail valgrind CI). Ticket: ENT-13720 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech> (cherry picked from commit 9e499ed)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
During shutdown, the polling loop in
ShellCommandReturnsZero(added in ec2627e) aborts the cf-promises child and returnsfalse. The callerGenericAgentArePromisesValidcould not distinguish this from a real validation failure and loggedPolicy failed validation with command '...'atLOG_LEVEL_ERR.The valgrind CI's
check_daemon_outputgreps the daemon stdout forerrorand fails on this otherwise harmless shutdown message (see valgrind-checks job #303).Now check
IsPendingTermination()at the call site and downgrade toLOG_LEVEL_VERBOSEwhen we aborted because the daemon is shutting down. Real validation failures keep their original error log.Backported from #6133