Skip to content

bump libnetwork and dependencies to 92d1fbe1eb0883cf11d283cea8e658275146411d#39855

Merged
thaJeztah merged 3 commits intomoby:masterfrom
thaJeztah:bump_libnetwork
Sep 3, 2019
Merged

bump libnetwork and dependencies to 92d1fbe1eb0883cf11d283cea8e658275146411d#39855
thaJeztah merged 3 commits intomoby:masterfrom
thaJeztah:bump_libnetwork

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Sep 3, 2019

this update is needed for docker-archive#330 (which currently has the regression introduced by moby/libnetwork#241)

bump libnetwork to 92d1fbe1eb0883cf11d283cea8e658275146411d

full diff: moby/libnetwork@09cdcc8...92d1fbe

relevant changes included (omitting some changes that were added and reverted in this bump):

bump hashicorp/go-multierror v1.0.0, add errwrap v1.0.0

full diff: hashicorp/go-multierror@fcdddc3...v1.0.0

bump hashicorp/go-sockaddr v1.0.2

full diff: hashicorp/go-sockaddr@6d291a9...v1.0.2

Relevant changes:

@thaJeztah
bump lib network to 92d1fbe1eb0883cf11d283cea8e658275146411d
bab58c1 
full diff: moby/libnetwork@09cdcc8...92d1fbe

relevant changes included (omitting some changes that were added _and_ reverted in this bump):

- moby/libnetwork#2433 Fix parseIP error when parseIP before get AddressFamily
  - fixes moby/libnetwork#2431 parseIP Error ip=[172 17 0 2 0 0 0 0 0 0 0 0 0 0 0 0]
  - moby/libnetwork#2289
  - this was a regression introduced in moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2440 Bump hashicorp go-sockaddr v1.0.2, go-multierror v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
bump hashicorp/go-multierror v1.0.0, add errwrap v1.0.0
720b66e 
full diff: hashicorp/go-multierror@fcdddc3...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
bump hashicorp/go-sockaddr v1.0.2
492945c 
full diff: hashicorp/go-sockaddr@6d291a9...v1.0.2

Relevant changes:
  - hashicorp/go-sockaddr#25 Add android os
  - hashicorp/go-sockaddr#28 Add go.mod

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah requested a review from tianon as a code owner September 3, 2019 09:57
@thaJeztah thaJeztah mentioned this pull request Sep 3, 2019
Merged
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Sep 3, 2019

ping @arkodg @selansen ptal

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Sep 3, 2019

Windows RS1 failure looks like flaky (opened a ticket for that); #39857

https://ci.docker.com/public/blue/rest/organizations/jenkins/pipelines/moby/branches/PR-39855/runs/1/nodes/39/log/?start=0

[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=info msg="Trying to get region from EC2 Metadata"
[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=info msg="Log stream already exists" errorCode=ResourceAlreadyExistsException logGroupName= logStreamName= message= origError="<nil>"
[2019-09-03T10:15:19.914Z] --- FAIL: TestLogBlocking (0.02s)
[2019-09-03T10:15:19.914Z]     cloudwatchlogs_test.go:313: Expected to be able to read from stream.messages but was unable to
[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=error msg=Error
[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=error msg="Failed to put log events" errorCode=InvalidSequenceTokenException logGroupName=groupName logStreamName=streamName message="use token token" origError="<nil>"
[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=error msg="Failed to put log events" errorCode=DataAlreadyAcceptedException logGroupName=groupName logStreamName=streamName message="use token token" origError="<nil>"
[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=info msg="Data already accepted, ignoring error" errorCode=DataAlreadyAcceptedException logGroupName=groupName logStreamName=streamName message="use token token"
[2019-09-03T10:15:19.914Z] FAIL

@selansen
Copy link
Copy Markdown
Contributor

selansen commented Sep 3, 2019

Windows RS1 failure looks like flaky (opened a ticket for that); #39857

https://ci.docker.com/public/blue/rest/organizations/jenkins/pipelines/moby/branches/PR-39855/runs/1/nodes/39/log/?start=0

[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=info msg="Trying to get region from EC2 Metadata"
[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=info msg="Log stream already exists" errorCode=ResourceAlreadyExistsException logGroupName= logStreamName= message= origError="<nil>"
[2019-09-03T10:15:19.914Z] --- FAIL: TestLogBlocking (0.02s)
[2019-09-03T10:15:19.914Z]     cloudwatchlogs_test.go:313: Expected to be able to read from stream.messages but was unable to
[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=error msg=Error
[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=error msg="Failed to put log events" errorCode=InvalidSequenceTokenException logGroupName=groupName logStreamName=streamName message="use token token" origError="<nil>"
[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=error msg="Failed to put log events" errorCode=DataAlreadyAcceptedException logGroupName=groupName logStreamName=streamName message="use token token" origError="<nil>"
[2019-09-03T10:15:19.914Z] time="2019-09-03T10:15:19Z" level=info msg="Data already accepted, ignoring error" errorCode=DataAlreadyAcceptedException logGroupName=groupName logStreamName=streamName message="use token token"
[2019-09-03T10:15:19.914Z] FAIL

Thanks for pointing it out. Looks like this is the only error.

selansen
selansen approved these changes Sep 3, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@selansen selansen left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Sep 3, 2019

Thanks for reviewing; bringing this one in to fix that regression

@thaJeztah thaJeztah merged commit f505abb into moby:master Sep 3, 2019
@thaJeztah thaJeztah deleted the bump_libnetwork branch September 3, 2019 16:12
@thaJeztah thaJeztah added this to the 20.03.0 milestone Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@tianon tianon Awaiting requested review from tianon tianon is a code owner

+1 more reviewer

@selansen selansen selansen approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/networking Networking process/cherry-picked status/2-code-review

Projects

None yet

Milestone

20.10.0

Development

Successfully merging this pull request may close these issues.

parseIP Error ip=[172 17 0 2 0 0 0 0 0 0 0 0 0 0 0 0]

4 participants

@thaJeztah @selansen @AkihiroSuda @GordonTheTurtle