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

Improve error if auto-selecting IP-range failed #2306

Merged
merged 1 commit into from
Jan 3, 2019
Merged

Improve error if auto-selecting IP-range failed #2306

merged 1 commit into from
Jan 3, 2019

Conversation

qudongfang
Copy link
Contributor

@qudongfang qudongfang commented Nov 26, 2018

Improve error if auto-selecting IP-range failed.

Issue: #2305
Detailed information

netutils/utils_linux.go Outdated Show resolved Hide resolved
Copy link

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

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

LGTM

@fcrisciani fcrisciani merged commit e50e15f into moby:master Jan 3, 2019
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

Oh, dang; had a review pending that I didn't submit; see below 😅

Not a show-stopper; can be done in a follow-up

v4Net, err := FindAvailableNetwork(ipamutils.PredefinedLocalScopeDefaultNetworks)
if err != nil {
return nil, nil, err
return nil, nil, fmt.Errorf("%s, PredefinedLocalScopeDefaultNetworks List: %+v",
Copy link
Member

Choose a reason for hiding this comment

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

Probably better to use errors.Wrapf() for this, so that the original error is preserved

@thaJeztah
Copy link
Member

Actually, no available network looks to be the only error we can actually return, and using Wrapf would put that error at the end, so I think for now it's ok to keep it like this

thaJeztah added a commit to thaJeztah/docker that referenced this pull request Apr 1, 2019
full diff: moby/libnetwork@1a06131...ebcade7

relevant changes:

- moby/libnetwork#2349 IPVS: Add support for GetConfig/SetConfig
- moby/libnetwork#2343 Revert "debian has iptables-legacy and iptables-nft now"
- moby/libnetwork#2230 Moving IPVLAN driver out of experimental
- moby/libnetwork#2307 Fix for problem where agent is stopped and does not restart
- moby/libnetwork#2303 Touch-up error-message and godoc for ConfigVXLANUDPPort
- moby/libnetwork#2325 Fix possible nil pointer exception
- moby/libnetwork#2302 Use sync.RWMutex for VXLANUDPPort
- moby/libnetwork#2306 Improve error if auto-selecting IP-range failed

Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Apr 3, 2019
full diff: moby/libnetwork@1a06131...ebcade7

relevant changes:

- moby/libnetwork#2349 IPVS: Add support for GetConfig/SetConfig
- moby/libnetwork#2343 Revert "debian has iptables-legacy and iptables-nft now"
- moby/libnetwork#2230 Moving IPVLAN driver out of experimental
- moby/libnetwork#2307 Fix for problem where agent is stopped and does not restart
- moby/libnetwork#2303 Touch-up error-message and godoc for ConfigVXLANUDPPort
- moby/libnetwork#2325 Fix possible nil pointer exception
- moby/libnetwork#2302 Use sync.RWMutex for VXLANUDPPort
- moby/libnetwork#2306 Improve error if auto-selecting IP-range failed

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: 3ab093d5670e8d59f6ae0c4604b8fcabf1582854
Component: engine
adhulipa pushed a commit to adhulipa/docker that referenced this pull request Apr 11, 2019
full diff: moby/libnetwork@1a06131...ebcade7

relevant changes:

- moby/libnetwork#2349 IPVS: Add support for GetConfig/SetConfig
- moby/libnetwork#2343 Revert "debian has iptables-legacy and iptables-nft now"
- moby/libnetwork#2230 Moving IPVLAN driver out of experimental
- moby/libnetwork#2307 Fix for problem where agent is stopped and does not restart
- moby/libnetwork#2303 Touch-up error-message and godoc for ConfigVXLANUDPPort
- moby/libnetwork#2325 Fix possible nil pointer exception
- moby/libnetwork#2302 Use sync.RWMutex for VXLANUDPPort
- moby/libnetwork#2306 Improve error if auto-selecting IP-range failed

Signed-off-by: Sebastiaan van Stijn <[email protected]>
kiku-jw pushed a commit to kiku-jw/moby that referenced this pull request May 16, 2019
full diff: moby/libnetwork@1a06131...ebcade7

relevant changes:

- moby/libnetwork#2349 IPVS: Add support for GetConfig/SetConfig
- moby/libnetwork#2343 Revert "debian has iptables-legacy and iptables-nft now"
- moby/libnetwork#2230 Moving IPVLAN driver out of experimental
- moby/libnetwork#2307 Fix for problem where agent is stopped and does not restart
- moby/libnetwork#2303 Touch-up error-message and godoc for ConfigVXLANUDPPort
- moby/libnetwork#2325 Fix possible nil pointer exception
- moby/libnetwork#2302 Use sync.RWMutex for VXLANUDPPort
- moby/libnetwork#2306 Improve error if auto-selecting IP-range failed

Signed-off-by: Sebastiaan van Stijn <[email protected]>
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.

4 participants