Skip to content
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.

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

Use GenericContainer in RyukResourceReaper #5358

Merged
merged 7 commits into from
May 16, 2022
Merged

Conversation

bsideup
Copy link
Member

@bsideup bsideup commented May 8, 2022

No description provided.

@bsideup bsideup added this to the next milestone May 8, 2022
@bsideup bsideup requested a review from a team as a code owner May 8, 2022 11:37
@bsideup bsideup marked this pull request as draft May 8, 2022 15:18
Copy link
Member

@kiview kiview left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really nice change. Did you feel something is missing, or why is this in draft?

For reference, this is the failing HiveMq test, the container did not come up, seems flaky:
https://ge.testcontainers.org/s/5tslzttauuiwa/tests/:hivemq:test/org.testcontainers.hivemq.ContainerWithExtensionFromDirectoryIT/test_wrongDirectoryName()?top-execution=1

@bsideup bsideup marked this pull request as ready for review May 14, 2022 00:50
@bsideup
Copy link
Member Author

bsideup commented May 14, 2022

@kiview I wanted to fix Ryuk self terminating itself 😅 Since we migrated to GenericContainer, we started labelling Ryuk with the same label as Ryuk is using while pruning. That led to Ryuk killing itself and not cleaning resources that go after containers. Fixed in the last commit 👍

@kiview
Copy link
Member

kiview commented May 15, 2022

@bsideup Do you think we could add a ~smoke test for this issue with reasonable effort? Like triggering a test run that will result in a couple of different Docker resources being created, sending SIGKILL to the Java process, and checking if the resources were correctly cleaned up using Docker CLI? It doesn't need to be part of this PR of course, just wanted to discuss the possibility.

@bsideup
Copy link
Member Author

bsideup commented May 15, 2022

@kiview good idea - I will create a DaemonTest-like test 👍

@bsideup
Copy link
Member Author

bsideup commented May 15, 2022

@kiview added a test and manually verified that it fails without the container == ryukContainer change 🎉

Copy link
Member

@kiview kiview left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that's a really cool test 🙂

@bsideup bsideup merged commit 98b60fb into master May 16, 2022
@delete-merged-branch delete-merged-branch bot deleted the ryuk_GenericContainer branch May 16, 2022 17:27
@bsideup bsideup changed the title Experiment: Use GenericContainer in RyukResourceReaper Use GenericContainer in RyukResourceReaper May 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants