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

Allowing Blocking call for handlePossibleCancellationInterrupt #3515

Merged
merged 8 commits into from
Jun 30, 2023

Conversation

tejavenkatlanka
Copy link
Contributor

fixs #3512

@tejavenkatlanka tejavenkatlanka requested a review from a team as a code owner June 22, 2023 19:57
@OlegDokuka OlegDokuka self-requested a review June 26, 2023 16:34
Copy link
Contributor

@OlegDokuka OlegDokuka left a comment

Choose a reason for hiding this comment

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

the test should not be touched at all. ReactorBlockHoundIntegration it selves has to be edited with proposed change

allowBlockingCallsInside("java.util.concurrent.FutureTask",
				          "handlePossibleCancellationInterrupt")

@tejavenkatlanka
Copy link
Contributor Author

@OlegDokuka I have reverted the test changes.
Please check

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2022 VMware Inc. or its affiliates, All Rights Reserved.
Copy link
Contributor

Choose a reason for hiding this comment

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

this should also be reverted

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @OlegDokuka reverted this change

@@ -50,5 +50,7 @@ public void applyTo(BlockHound.Builder builder) {
// For now, let's not add a separate integration, but rather let's define the class name manually
// ContextRegistry reads files as part of the Service Loader aspect. If class is initialized in a non-blocking thread, BlockHound would complain
builder.allowBlockingCallsInside("reactor.core.publisher.ContextPropagation", "<clinit>");
builder.allowBlockingCallsInside("java.util.concurrent.FutureTask",
Copy link
Contributor

Choose a reason for hiding this comment

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

use FutureTask.class.getName() instead of "java.util.concurrent.FutureTask"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Update with class reference

@tejavenkatlanka
Copy link
Contributor Author

I've made required changes. @OlegDokuka please check

@OlegDokuka OlegDokuka merged commit 1775de2 into reactor:main Jun 30, 2023
6 checks passed
@OlegDokuka
Copy link
Contributor

OlegDokuka commented Jun 30, 2023

@tejavenkatlanka great job! Thank you for your contribution!

@chemicL chemicL added this to the 3.5.8 milestone Jul 12, 2023
@chemicL chemicL added the type/bug A general bug label Jul 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/bug A general bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants