Have resources initialized before deleting overlay network #1071
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
LGTM |
| @@ -109,6 +109,11 @@ func (d *driver) DeleteNetwork(nid string) error { | |||
| return fmt.Errorf("could not find network with id %s", nid) | |||
| } | |||
|
|
|||
| // Make sure driver resources are initialized before proceeding | |||
| if err := d.configure(); err != nil { | |||
There was a problem hiding this comment.
You should do this before trying to get d.network because it may depend on the configuration to be completed.
There was a problem hiding this comment.
After the introduction of the datastore update, config() now only contains the vxlan idm initialization.
But I agree if in future we add more stuff in configure(), then it is better to have it executed at the beginning of this function.
- Otherwise a overlay network delete after daemon restart will hit a nil pointer dereference while releasing the vxlan id Signed-off-by: Alessandro Boch <aboch@docker.com>
|
@mrjana |
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
will hit a nil pointer dereference while releasing the
vxlan id
Steps to reproduce:
Signed-off-by: Alessandro Boch aboch@docker.com