TestThread: Try interrupt() before stop() in tearDown()#8169
Open
nickita-khylkouski wants to merge 2 commits intogoogle:masterfrom
Open
TestThread: Try interrupt() before stop() in tearDown()#8169nickita-khylkouski wants to merge 2 commits intogoogle:masterfrom
nickita-khylkouski wants to merge 2 commits intogoogle:masterfrom
Conversation
This allows interruptible threads (like those in InterruptibleMonitorTest) to clean up gracefully instead of relying solely on the deprecated Thread.stop() method. The implementation: 1. Calls interrupt() first 2. Waits DUE_DILIGENCE_MILLIS for the thread to respond 3. Falls back to reflective stop() only if the thread is still alive This addresses Issue google#7319 as suggested by cpovirk.
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
2 participants
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
This PR improves
TestThread.tearDown()to tryinterrupt()before falling back toThread.stop(), as suggested by @cpovirk in #7319.Changes:
interrupt()first, allowing interruptible threads (like those inInterruptibleMonitorTest) to clean up gracefullyDUE_DILIGENCE_MILLIS(100ms) for the thread to respond to the interruptstop()if the thread is still alive after the interrupt attemptMotivation
The existing implementation immediately tries
Thread.stop()via reflection, which:UnsupportedOperationExceptionon Java 20+Many test threads (particularly in
InterruptibleMonitorTest) are designed to respond to interrupts. By tryinginterrupt()first, we allow these threads to terminate cleanly without relying on the deprecatedstop()method.Behavior by Java Version
Testing
Verified locally that existing tests pass:
InterruptibleMonitorTest- 16 tests ✅UninterruptibleMonitorTest- 16 tests ✅UninterruptiblesTest- 49 tests ✅Related Issues
Fixes #7319