Skip to content
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.

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

[BUGFIX] disable ip protocol fallback and tests #540

Merged
merged 1 commit into from
Oct 23, 2019
Merged

[BUGFIX] disable ip protocol fallback and tests #540

merged 1 commit into from
Oct 23, 2019

Conversation

genofire
Copy link
Contributor

  • fix ip protocol fallback
    • before the argument fallbackIPProtocol in chooseProtocol() (prober/utils.go) was never used
  • correct / get default value of IPProtocol during testing
    • ipv4 is a wrong value, it should be ip4 or ip6

genofire referenced this pull request Oct 23, 2019
* travisci skip ipv6 dns tests

Signed-off-by: Thor <[email protected]>
prober/utils_test.go Outdated Show resolved Hide resolved
@@ -226,27 +230,23 @@ func TestAuthoritativeDNSResponse(t *testing.T) {
}{
{
config.DNSProbe{
IPProtocol: "ipv4",
QueryName: "example.com",
QueryName: "example.com",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leave these as v4 please.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with fallback?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't matter either way.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thats the problem, on my notebook some test failures if there is no fallback and it try only ipv4

}, false,
},
{
config.DNSProbe{
IPProtocol: "ipv4",
QueryName: "example.com",
IPProtocol: "ip4",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, are we missing a sanity check on the value of this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jep, but please let somebody else do it ...

@brian-brazil brian-brazil merged commit 2e7c8cd into prometheus:master Oct 23, 2019
@genofire genofire deleted the fix-family branch November 6, 2019 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants