[service_discovery] Fix race condition preventing SD initialization #135
Conversation
This file contains 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
If JMXFetch starts before the collector process creates the SD pipe, JMXFetch doesn't find the SD pipe and never re-tries opening it, (until it's fully restarted). To solve this, retry opening the SD pipe at every run iteration when SD is enabled. Also, add an `--sd-enabled` option to know whether JMXFetch should enable SD (i.e. whether it should expect the SD pipe to exist or not). The `--sd-standby` option is not used and has therefore been removed. This change requires a change to `dd-agent` to make `jmxfetch.py` pass the `--sd-enabled` option when SD-JMXFetch is enabled.
This was referenced Apr 17, 2017
derekwbrown
approved these changes
Apr 17, 2017
| if(sdPipe == null && appConfig.getSDEnabled()) { | ||
| // If SD is enabled and the pipe is not open, retry opening pipe | ||
| sdPipe = newSdPipe(); | ||
| } | ||
| try { |
There was a problem hiding this comment.
Little nit, but could do
int len = 0
if(sdPipe != null && ((len = sdPipe.available()) > 0)) {
byte[] buffer....
No need to call sdPipe.available twice in succession.
There was a problem hiding this comment.
👍 , addressed in 1c5bede
Addresses review comment
truthbk
approved these changes
Apr 18, 2017
|
There's a weird Travis error for oraclejdk7, let's make sure we know what's up with that before merging. I think it's unrelated. |
|
Must've been a flaky test, I've just re-run the tests on oraclejdk7 and they're all green now! Merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
If JMXFetch starts before the collector process creates the SD pipe,
JMXFetch doesn't find the SD pipe and never re-tries opening it (until
it's fully restarted).
To solve this, retry opening the SD pipe at every run iteration when
SD is enabled. Also, add an
--sd-enabledoption to know whetherJMXFetch should enable SD (i.e. whether it should expect the SD pipe
to exist or not).
The
--sd-standbyoption is not used and has therefore been removed.This change requires a change to
dd-agentto makejmxfetch.pypassthe
--sd-enabledoption when SD-JMXFetch is enabled. See DataDog/dd-agent#3306