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.
This PR addresses an instability in Agent legacy tests
test-51
andtest-52
.In
graceful_shutdown()
intool_meister_stop.py
, the code issues a debug log message if it has to wait for the Tool Data Sync to exit. However, if, by the time control reaches this point, the TDS has already exited, then the PID file will have been removed, and the attempt to read it produces an exception which is discarded and the wait is skipped.This results in a race condition which may or may not produce the log message output. There is no correctness issue associated with the presence or absence of the message in the log, but the legacy unit test system won't tolerate variable output, and, since the "gold" file includes the message, the test is considered to have failed any time the race goes the other way.
This PR modifies the output filtering for this message to, instead of masking just the PID value, remove the line from the log altogether if it is present. And, it updates the two relevant "gold" files. This should enable a deterministic result.
This PR also removes an unused definition which was left over from PR #3427 and reformats a long line which it added.