MINOR: kern_procargs more robust on darwin #78
Merged
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
This failure should not be related to changes. |
ph
added a commit
to ph/gosigar
that referenced
this pull request
Oct 10, 2017
When working on elastic#78, I was hit by a test failing on linux (debian host) Our code is triming values so we need to adjust the test code to make sure we also trim values before doing the comparison. Example: ``` expected: "${debian_chroot:+($debian_chroot)}\\u@\\h:\\w\\$ " actual: "${debian_chroot:+($debian_chroot)}\\u@\\h:\\w\\$" ```
ph
added a commit
to ph/gosigar
that referenced
this pull request
Oct 10, 2017
When working on elastic#78, I was hit by a test failing on linux (debian host) Our code is triming values so we need to adjust the test code to make sure we also trim values before doing the comparison. Example: ``` expected: "${debian_chroot:+($debian_chroot)}\\u@\\h:\\w\\$ " actual: "${debian_chroot:+($debian_chroot)}\\u@\\h:\\w\\$" ```
ph
added a commit
to ph/gosigar
that referenced
this pull request
Oct 11, 2017
When working on elastic#78, I was hit by a test failing on linux (debian host) Our code is triming values so we need to adjust the test code to make sure we also trim values before doing the comparison. Example: ``` expected: "${debian_chroot:+($debian_chroot)}\\u@\\h:\\w\\$ " actual: "${debian_chroot:+($debian_chroot)}\\u@\\h:\\w\\$" ```
ph
force-pushed
the
fix/make-darwin-pid-check-more-robust
branch
from
4ccc5c9 to
876f407
Compare
|
Require #79 to make the test green under linux. |
andrewkroh
reviewed
Oct 11, 2017
sigar_darwin.go
Outdated
| @@ -420,7 +420,12 @@ func kern_procargs(pid int, | |||
| return fmt.Errorf("Error reading args: %v", err) | |||
| } | |||
| pair := bytes.SplitN(chop(line), delim, 2) | |||
| env(string(pair[0]), string(pair[1])) | |||
|
|
|||
| if len(pair) == 2 { | |||
There was a problem hiding this comment.
It seems more common in Go to check for the error case and omit the else (i.e. if len != 2 { return error }).
andrewkroh
pushed a commit
that referenced
this pull request
Oct 11, 2017
When working on #78, I was hit by a test failing on linux (debian host) Our code is triming values so we need to adjust the test code to make sure we also trim values before doing the comparison. Example: ``` expected: "${debian_chroot:+($debian_chroot)}\\u@\\h:\\w\\$ " actual: "${debian_chroot:+($debian_chroot)}\\u@\\h:\\w\\$" ```
|
@andrewkroh updated with comments from the review. |
ph
force-pushed
the
fix/make-darwin-pid-check-more-robust
branch
from
82cfe9e to
b9dbf3b
Compare
Under some circonstance the code can fail, the root cause is not clear at the moment, but we should still make the code more robust when retrieving information for a specific process. The problem is the `bytes.SplitN` can return an array of one element making the process panic when we access the other element. This commit make the code a bit more robust and check to make sure we successfully retrieved 2 elements instead of one and return an error if it failed. Reference: elastic/beats#5337
ph
force-pushed
the
fix/make-darwin-pid-check-more-robust
branch
from
b9dbf3b to
d81aa9d
Compare
|
@ph Would you like to make a release and update the vendored copy in beats? (or I can do it) |
|
@andrewkroh I can do it, its only a matter of doing the following?
|
|
@ph Exactly. Plus add back the "Unreleased" placeholder to the changelog after tagging. That's not really required but it's nice touch for the next person that makes a change. |
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.
Under some circonstance the code can fail, the root cause is not clear
at the moment, but we should still make the code more robust when
retrieving information for a specific process.
The problem is the
bytes.SplitNcan return an array of one elementmaking the process panic when we access the other element.
This commit make the code a bit more robust and check to make sure we
successfully retrieved 2 elements instead of one and return an error
if it failed.
Reference: elastic/beats#5337