Fix error handling about bridgeSetup #2215
Merged
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
fcrisciani
reviewed
Jul 3, 2018
drivers/bridge/bridge.go
Outdated
| @@ -735,7 +735,11 @@ func (d *driver) createNetwork(config *networkConfiguration) error { | |||
|
|
|||
| // Apply the prepared list of steps, and abort at the first error. | |||
| bridgeSetup.queueStep(setupDeviceUp) | |||
| return bridgeSetup.apply() | |||
| if err = bridgeSetup.apply(); err != nil { | |||
There was a problem hiding this comment.
would be better if you change the method prototype like this:
func (d *driver) createNetwork(config *networkConfiguration) (err error) {
and remove line 618
that way we are sure that if the body of this function has a return the defer is still being honored
There was a problem hiding this comment.
If we were going that route I'd probably suggest something less generic than err. It's almost idiomatic to shadow it.
|
Thanks @hzue, I left a comment on the patch |
ctelfer
approved these changes
Jul 3, 2018
Fix the error from bridgeSetup doesn't handle by the defer function in the createNetwork function. Signed-off-by: Terry Chu <jubosh.tw@gmail.com>
|
Hi @fcrisciani @ctelfer, thanks for your advice. |
|
Still LGTM. |
|
Thanks @hzue |
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.
Fix the error from bridgeSetup doesn't handle by the defer function in the createNetwork function.
Signed-off-by: Terry Chu jubosh.tw@gmail.com