remove config mismatched port during creation #2582
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
Codecov Report
@@ Coverage Diff @@
## main #2582 +/- ##
===========================================
+ Coverage 42.18% 65.43% +23.24%
===========================================
Files 153 287 +134
Lines 18491 29653 +11162
===========================================
+ Hits 7801 19402 +11601
+ Misses 9991 8493 -1498
- Partials 699 1758 +1059
Flags with carried forward coverage won't be shown. Click here to find out more.
|
tnqn
reviewed
Aug 12, 2021
| if interfaceConfig.OFPort != 0 { | ||
| return interfaceConfig.OFPort, nil | ||
| if err := c.ovsBridgeClient.DeletePort(interfaceConfig.PortUUID); err != nil { | ||
| return 0, fmt.Errorf("IPSec tunnel interface config doesn't match cached one, fail to delete stale IPSec tunnel port %s: %v", interfaceConfig.InterfaceName, err) |
There was a problem hiding this comment.
The first sencence can be a separate log indicating a mismatch is detected and it's going to delete the stale port.
klog.InfoS("IPSec tunnel interface config doesn't match the cached one, deleting the stale IPSec tunnel port", "node", nodeName, "interface", interfaceConfig.InterfaceName)
if err := c.ovsBridgeClient.DeletePort(interfaceConfig.PortUUID); err != nil {
return 0, fmt.Errorf("failed to delete stale IPSec tunnel port %s: %v", interfaceConfig.InterfaceName, err)
}
| } | ||
| } else { | ||
| } | ||
| if !ok || hasRemoved { |
There was a problem hiding this comment.
nit: you can rename ok to exists and set it to false after deleting the stale port, then only need to check exists here.
Signed-off-by: Lan Luo <[email protected]>
|
Hi @tnqn Could you help to take a look again? last time I addressed a comment but no review yet. thanks! |
|
/test-all |
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.
Signed-off-by: Lan Luo [email protected]