Skip to content

Fixed getNetworkFromStore, which returned an incorrect struct#2449

Merged
selansen merged 2 commits intomoby:masterfrom
espensuenson:bugfix_getnetworkfromstore
Sep 28, 2019
Merged

Fixed getNetworkFromStore, which returned an incorrect struct#2449
selansen merged 2 commits intomoby:masterfrom
espensuenson:bugfix_getnetworkfromstore

Conversation

@espensuenson
Copy link
Contributor

Fixed getNetworkFromStore, which returned incorrect network information - notably, the 'resolver' field was empty.

This fixes moby/moby#38901

Signed-off-by: Espen Suenson mail@espensuenson.dk

…on - notably, the 'resolver' field was empty.

This fixes moby/moby#38901

Signed-off-by: Espen Suenson <mail@espensuenson.dk>
@espensuenson
Copy link
Contributor Author

@thaJeztah any chance that this PR will be looked at soon? We cannot use docker networks for continuous integration until the associated bug is fixed.

@thaJeztah
Copy link
Member

ping @euanh @vikramhh @arkodg PTAL

Copy link

@vikramhh vikramhh left a comment

Choose a reason for hiding this comment

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

Possibly we should return immediately after line 83 in case of error. Otherwise an empty map iteration would lead to "network not found" error being returned instead of the actual error from getNetworksFromStore.

@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "bugfix_getnetworkfromstore" git@github.com:espensuenson/libnetwork.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354325096
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

Signed-off-by: Espen Suenson <mail@espensuenson.dk>
@espensuenson
Copy link
Contributor Author

@vikramhh I changed it to return immediately in case of error.

@vikramhh
Copy link

@espensuenson - thanks. LGTM

Copy link
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

@selansen selansen merged commit f5e0618 into moby:master Sep 28, 2019
espensuenson added a commit to espensuenson/moby that referenced this pull request Oct 1, 2019
Issues that are fixed :
log the actual error when failing to add IPv6 route moby/libnetwork#2444
Shorten controller ID in exec-root to not hit UNIX_PATH_MAX moby/libnetwork#2443
Fixed getNetworkFromStore, which returned an incorrect struct moby/libnetwork#2449
weighted scheduling methods constants for ipvs moby/libnetwork#2453
Resolve "bridge fdb show" hang issue moby/libnetwork#2456

Signed-off-by: Espen Suenson <mail@espensuenson.dk>
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.

"Docker network rm" does not remove Resolver UDP port 53 for created gateway IP

5 participants