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.

Sign up for GitHub

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

Jump to bottom

[backport/1.6.x] Update to miekg/dns v1.1.26 #7261

Merged
merged 2 commits into from
Feb 11, 2020
Merged

[backport/1.6.x] Update to miekg/dns v1.1.26 #7261

merged 2 commits into from
Feb 11, 2020

Conversation

mikemorris
Copy link
Contributor

@mikemorris mikemorris commented Feb 11, 2020 •
edited
Loading

Backport of #6748 and #7252 to 1.6.x

@mikemorris mikemorris force-pushed the backport-1.6.x/miekg-dns-v1.1.26 branch 2 times, most recently from a506e6a to 20cb67a Compare February 11, 2020 16:05
rboyer
rboyer approved these changes Feb 11, 2020
View reviewed changes
Copy link
Member

@rboyer rboyer left a comment

Choose a reason for hiding this comment

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

LGTM assuming tests pass.

@mikemorris
Copy link
Contributor Author

Alright, so it looks like there were some spots where dns.ErrTruncated was being used prior to the refactoring for 1.7.0 - @i0rek would appreciate your 👀 on this.

go vet ./...

# github.com/hashicorp/consul/agent
agent/dns.go:1592:34: undefined: dns.ErrTruncated
# github.com/hashicorp/consul/agent [github.com/hashicorp/consul/agent.test]
agent/dns.go:1592:34: undefined: dns.ErrTruncated
agent/dns_test.go:3305:12: undefined: dns.ErrTruncated
agent/dns_test.go:3990:33: undefined: dns.ErrTruncated
agent/dns_test.go:4071:27: undefined: dns.ErrTruncated
agent/dns_test.go:4143:27: undefined: dns.ErrTruncated

42wim and others added 2 commits February 11, 2020 11:27
@42wim @mikemorris
dns: fix memoryleak by upgrading outdated miekg/dns (#6748)
c8c32de 
* Add updated github.com/miekg/dns to go modules
* Add updated github.com/miekg/dns to vendor
* Fix github.com/miekg/dns api breakage
* Decrease size when trimming UDP packets
Need more room for the header(?), if we don't decrease the size we get an
"overflow unpacking uint32" from the dns library
* Fix dns truncate tests with api changes
* Make windows build working again. Upgrade x/sys and x/crypto and vendor
This upgrade is needed because of API breakage in x/sys introduced
by the minimal x/sys dependency of miekg/dns

This API breakage has been fixed in commit
golang/sys@855e68c
@mkeeler @mikemorris
Update to miekg/dns v1.1.26 (#7252)
a155755
@mikemorris mikemorris force-pushed the backport-1.6.x/miekg-dns-v1.1.26 branch from 20cb67a to a155755 Compare February 11, 2020 16:29
@mikemorris
Copy link
Contributor Author

Looks like the refactoring to remove the ErrTruncated constant usage was addressed in #6748 so reworked to pull that in first, 🤞 this might be good now.

@mikemorris mikemorris merged commit 91695f8 into release/1.6.x Feb 11, 2020
@mikemorris mikemorris deleted the backport-1.6.x/miekg-dns-v1.1.26 branch February 11, 2020 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rboyer rboyer rboyer approved these changes

@hanshasselberg hanshasselberg Awaiting requested review from hanshasselberg

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mikemorris @rboyer @42wim @mkeeler