awscloud/secure-instance: fix cleaning up fleets with creation errors #4489
+18
−6
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
We're seeing some behaviour where create fleet is not retried and subsequently the SI cleanup fails due to the security group already being tied to an existing instance. There is no error that an instance was launched anyway.
By surfacing the output even in case of an error, the fleet ID and instance ID can be extracted if present. Thus the instance can be terminated before its dependencies are deleted.
croissanne
changed the title
schuellerf
approved these changes
Nov 22, 2024
| if len(createFleetOutput.Instances) > 0 && len(createFleetOutput.Instances[0].InstanceIds) > 0 { | ||
| secureInstance.InstanceID = createFleetOutput.Instances[0].InstanceIds[0] | ||
| } | ||
| } |
There was a problem hiding this comment.
we could as well move this block before the if err != nil { and comment that we need this info regardless of err or not and remove the code duplication below, right?
but I'm fine with this, too
| @@ -639,6 +650,7 @@ func doCreateFleetRetry(cfOutput *ec2.CreateFleetOutput) (bool, []string) { | |||
| msg := []string{} | |||
| retry := false | |||
| for _, err := range cfOutput.Errors { | |||
| logrus.Infof("Comparing create fleet error %s (msg: %s)", *err.ErrorCode, *err.ErrorMessage) | |||
There was a problem hiding this comment.
Maybe more descriptive why we compare?
Suggested change
| logrus.Infof("Comparing create fleet error %s (msg: %s)", *err.ErrorCode, *err.ErrorMessage) | |
| logrus.Infof("Checking to retry fleet create on error %s (msg: %s)", *err.ErrorCode, *err.ErrorMessage) |
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.
By surfacing the output even in case of an error, the fleet ID and
instance ID can be extracted if present. Thus the instance can be
terminated before its dependencies are deleted.
We're seeing some behaviour where create fleet is not retried and subsequently the SI cleanup fails due to the security group already being tied to an existing instance. There is no error that an instance was launched anyway.