Skip to content

Properly fix possible deadlock, when blocking in mock response generators and fix fallout of #1885 (#583, #1899)#1910

Merged
leonard84 merged 6 commits into
masterfrom
vampire/issue-583
Mar 17, 2024
Merged

Properly fix possible deadlock, when blocking in mock response generators and fix fallout of #1885 (#583, #1899)#1910
leonard84 merged 6 commits into
masterfrom
vampire/issue-583

Conversation

@Vampire

@Vampire Vampire commented Mar 6, 2024

Copy link
Copy Markdown
Member

This PR reverts the changes of PR #1885 and hopefully fixes #583, #1882, and #1899 properly
without the fallout of the previous PR.
All interaction handling stays synchronized, but the response generation happens unsynchronized.

As said in #1885, I think this should immediately be released as 2.4-M3 if it passes review as in M2 the whole interaction handling is highly broken in any multi-threaded situation.

Vampire commented Mar 6, 2024

Copy link
Copy Markdown
Member Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @Vampire and the rest of your teammates on Graphite Graphite

@Vampire Vampire requested review from AndreasTu and leonard84 March 6, 2024 23:24

@leonard84 leonard84 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Not sure if I'll have the time for a release before Sunday.

Comment thread spock-specs/src/test/groovy/org/spockframework/smoke/mock/MultiThreaded.groovy Outdated
@Vampire Vampire added this to the 2.4-M3 milestone Mar 7, 2024
AndreasTu
AndreasTu previously approved these changes Mar 8, 2024
Comment thread docs/release_notes.adoc Outdated
Comment thread spock-core/src/main/java/org/spockframework/mock/IResponseGenerator.java Outdated
@Vampire Vampire force-pushed the vampire/issue-583 branch from bbf7e5d to 01d7eb8 Compare March 10, 2024 16:20
@Vampire Vampire requested a review from leonard84 March 10, 2024 22:16
leonard84
leonard84 previously approved these changes Mar 11, 2024
AndreasTu
AndreasTu previously approved these changes Mar 12, 2024
@Vampire Vampire force-pushed the vampire/issue-583 branch from eaf7667 to 4e8b3ca Compare March 16, 2024 16:38
@leonard84 leonard84 dismissed stale reviews from AndreasTu and themself via 3e7babb March 17, 2024 16:36
@leonard84 leonard84 enabled auto-merge (squash) March 17, 2024 16:39
@leonard84 leonard84 merged commit b2f3091 into master Mar 17, 2024
@leonard84 leonard84 deleted the vampire/issue-583 branch March 17, 2024 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Concurrent interactions deadlock because of a synchronized method MockController#handle

3 participants