Skip to content

Fix async API queue deletion during cluster down #2216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2021
Merged

Fix async API queue deletion during cluster down #2216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions cli/cmd/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,25 +484,17 @@ var _clusterDownCmd = &cobra.Command{
loadBalancer, _ := getLoadBalancer(accessConfig.ClusterName, OperatorLoadBalancer, awsClient)

fmt.Print("￮ deleting sqs queues ... ")
if queueExists, err := awsClient.DoesQueueExist(clusterconfig.SQSNamePrefix(accessConfig.ClusterName)); err != nil {
numDeleted, err := awsClient.DeleteQueuesWithPrefix(clusterconfig.SQSNamePrefix(accessConfig.ClusterName))
if err != nil {
errorsList = append(errorsList, err)
fmt.Print("failed ✗")
fmt.Printf("\n\nfailed to delete all sqs queues; please delete queues starting with the name %s via the cloudwatch console: https://%s.console.aws.amazon.com/sqs/v2/home\n", clusterconfig.SQSNamePrefix(accessConfig.ClusterName), accessConfig.Region)
errors.PrintError(err)
fmt.Println()
} else if !queueExists {
} else if numDeleted == 0 {
fmt.Println("no sqs queues exist ✓")
} else {
err = awsClient.DeleteQueuesWithPrefix(clusterconfig.SQSNamePrefix(accessConfig.ClusterName))
if err != nil {
fmt.Print("failed ✗")
errorsList = append(errorsList, err)
fmt.Printf("\n\nfailed to delete all sqs queues; please delete queues starting with the name %s via the cloudwatch console: https://%s.console.aws.amazon.com/sqs/v2/home\n", clusterconfig.SQSNamePrefix(accessConfig.ClusterName), accessConfig.Region)
errors.PrintError(err)
fmt.Println()
} else {
fmt.Println("✓")
}
fmt.Println("✓")
}

clusterDoesntExist := !clusterExists
Expand Down
11 changes: 7 additions & 4 deletions pkg/lib/aws/sqs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ func (c *Client) DoesQueueExist(queueName string) (bool, error) {
return true, nil
}

func (c *Client) DeleteQueuesWithPrefix(queueNamePrefix string) error {
func (c *Client) DeleteQueuesWithPrefix(queueNamePrefix string) (int, error) {
var numDeleted int
var deleteError error

err := c.SQS().ListQueuesPages(&sqs.ListQueuesInput{
Expand All @@ -75,6 +76,8 @@ func (c *Client) DeleteQueuesWithPrefix(queueNamePrefix string) error {
QueueUrl: queueURL,
})

numDeleted++

if deleteError != nil {
deleteError = err
}
Expand All @@ -83,12 +86,12 @@ func (c *Client) DeleteQueuesWithPrefix(queueNamePrefix string) error {
})

if err != nil {
return errors.WithStack(err)
return 0, errors.WithStack(err)
}

if deleteError != nil {
return errors.WithStack(deleteError)
return 0, errors.WithStack(deleteError)
}

return nil
return numDeleted, nil
}