Clean up leaked ENIs in the background #624
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
|
Logs: |
vsiddharth
previously requested changes
Sep 25, 2019
e56efa2 to
24c5d17
Compare
24c5d17 to
2824a32
Compare
nckturner
reviewed
Sep 26, 2019
2e76098 to
0512000
Compare
shyamjvs
reviewed
Sep 27, 2019
| @@ -62,6 +64,9 @@ const ( | |||
|
|
|||
| // UnknownInstanceType indicates that the instance type is not yet supported | |||
| UnknownInstanceType = "vpc ip resource(eni ip limit): unknown instance type" | |||
|
|
|||
| // Stagger cleanup start time to avoid calling EC2 too much. Time in seconds. | |||
| eniCleanupStartupDelayMax = 300 | |||
There was a problem hiding this comment.
Can you make the value 300 * time.Second to make the units clear instead of just saying that in a comment?
There was a problem hiding this comment.
Well, it's used in a call to rand, so it can't be a duration. It's just a random upper limit.
startupDelay := time.Duration(rand.Intn(eniCleanupStartupDelayMax)) * time.Second
Cleaned up the printing a bit.
shyamjvs
reviewed
Sep 27, 2019
pkg/awsutils/awsutils.go
Outdated
| } | ||
| // Sleep one hour before checking again | ||
| time.Sleep(1 * time.Hour) | ||
| log.Debug("Checking for leaked AWS CNI ENIs.") |
There was a problem hiding this comment.
Can you move this log line to the top of the for loop to make it more accurate?
shyamjvs
reviewed
Sep 27, 2019
pkg/awsutils/awsutils.go
Outdated
| // Clean up all the leaked ones we found | ||
| for _, networkInterface := range networkInterfaces { | ||
| // Verify the description starts with "aws-K8S-" | ||
| if !strings.HasPrefix(aws.StringValue(networkInterface.Description), eniDescriptionPrefix) { |
There was a problem hiding this comment.
Can you move this filtering into the getFilteredListOfNetworkInterfaces() to keep the logic clean?
There was a problem hiding this comment.
Good idea, will do :)
shyamjvs
reviewed
Sep 27, 2019
pkg/awsutils/awsutils.go
Outdated
| @@ -223,6 +228,10 @@ func New() (*EC2InstanceMetadataCache, error) { | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
|
|
|||
| // Clean up leaked ENIs in the background | |||
| go cache.cleanUpLeakedENIs() | |||
There was a problem hiding this comment.
Instead of running a goroutine which infinitely loops with sleep in each iteration, you can do it a bit more cleanly as follows:
go wait.Until(cache.cleanUpLeakedENIs, time.Hour, wait.NeverStop)
And then the function itself can be a one-off operation:
func (cache *EC2InstanceMetadataCache) cleanUpLeakedENIs() {
// list enis
// delete enis
}
There was a problem hiding this comment.
Found this:
go wait.Forever(cache.cleanUpLeakedENIs, time.Hour)
There was a problem hiding this comment.
2019-09-27T18:59:25.632Z [INFO] Will attempt to clean up AWS CNI leaked ENIs after waiting 3m1s.
2019-09-27T19:02:26.633Z [DEBUG] Checking for leaked AWS CNI ENIs.
2019-09-27T19:02:26.934Z [DEBUG] No AWS CNI leaked ENIs found.
2019-09-27T20:02:26.934Z [INFO] Will attempt to clean up AWS CNI leaked ENIs after waiting 2m9s.
2019-09-27T20:04:35.934Z [DEBUG] Checking for leaked AWS CNI ENIs.
2019-09-27T20:04:36.057Z [DEBUG] No AWS CNI leaked ENIs found.
0512000 to
3fd6cb4
Compare
nckturner
approved these changes
Sep 27, 2019
Merged
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.
Issue #, if available: #608
Description of changes:
availablenode.k8s.amazonaws.com/instance_idaws-K8S-By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.