Use try/finally to shut down AWS clients on cancellation - #211
Open
sksamuel wants to merge 1 commit into
Open
Conversation
S3/SNS/SQS health checks all followed the pattern
runInterruptible(Dispatchers.IO) { runCatching { ... } }
.also { client.shutdown() }
`.also` does not run if `runInterruptible` is cancelled — the block
throws CancellationException before returning a value to chain on. Under
cancellation pressure (e.g. the registry's checkTimeout firing), the
AWS client and its HTTP connection pool / executor threads were leaked.
Switch to try/finally so shutdown always runs. While here, also wrap the
S3 write check's deleteObject in try/finally on putObject so a put/delete
that fails (or is cancelled) between the two doesn't leave orphan
`cohort_*` test keys in the bucket.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
S3 read+write, SNS and SQS health checks all followed:
```kotlin
runInterruptible(Dispatchers.IO) { runCatching { ... } }
.also { client.shutdown() }
```
`.also` does not run when `runInterruptible` is cancelled — the block throws `CancellationException` before returning a value. Under cancellation pressure (registry `checkTimeout` firing, etc.), the AWS client and its HTTP connection pool / executor threads leak.
Switch to `try/finally` so shutdown always runs. In `S3WriteBucketHealthCheck` also wrap `deleteObject` in a finally so a failure between put and delete doesn't leave orphan `cohort_*` keys.
Test plan
🤖 Generated with Claude Code