fix(core): reset Reaper state when ryuk is already being removed - #1126
Open
RitiGrover wants to merge 1 commit into
Open
RitiGrover wants to merge 1 commit into
RitiGrover wants to merge 1 commit into
Conversation
If ryuk died from outside, Docker was already auto-removing it and stop() got a 409. delete_instance() only suppressed NotFound, so the 409 escaped and skipped the resets. get_instance() then kept returning the dead reaper. A 409 is now treated like NotFound, and the class state is reset whatever stop() does. Fixes testcontainers#1125
This branch has not been deployed
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.
Fixes #1125
What was wrong
When ryuk was killed from outside, Docker was already auto-removing it.
delete_instance()got a 409 fromstop(), but it only suppressedNotFound. The 409 escaped before_containerand_instancewere reset, soget_instance()kept returning the dead reaper. The same 409 showed up in theatexithook.What changed
A 409 from
stop()is treated likeNotFound. The socket, container and instance are reset in afinally, so a failingstop()can't leave stale state either. This follows the fix suggested in the issue.How it was tested
Two unit tests with a fake dead container:
get_instance()creates a new reaper.APIErroris still raised, but the state is cleared.Both fail on main and pass with the fix. Ruff passes.
This touches the same function as #1124. Whichever lands second will need a small rebase, which I'll do.