GEODE-7591: Fix for hang in ClusterDistributionManager #5182
Conversation
This file contains 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
Added timeout after which it will be periodically checked whether distribution manager is disconnecting while waiting on the membership view installation to avoid hanging
bschuchardt
requested changes
Jun 5, 2020
...utedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
Outdated
Show resolved
Hide resolved
kirklund
requested changes
Jun 5, 2020
...utedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
Outdated
Show resolved
Hide resolved
* CyclicBarrier thread synchronization used instad await() * Future used to wait for completion of test
kirklund
reviewed
Jun 9, 2020
| cyclicBarrier.await(getTimeout().toMillis(), TimeUnit.MILLISECONDS); | ||
| system.disconnect(); | ||
| future.get(getTimeout().toMillis(), TimeUnit.MILLISECONDS); | ||
| } catch (InterruptedException | TimeoutException | ExecutionException |
There was a problem hiding this comment.
You can delete the catch-block and use of errorCollector in the main thread. You only need to do that inside the Runnable that you submitted. From line 400 on, it's better to just let the Exceptions percolate out of the test method and let junit catch it.
There was a problem hiding this comment.
You are right! Done.
Exceptions added to test method signature
bschuchardt
approved these changes
Jun 10, 2020
kirklund
approved these changes
Jun 16, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Added timeout after which it will be periodically checked whether
distribution manager is disconnecting while waiting on the membership
view installation to avoid hanging
Thank you for submitting a contribution to Apache Geode.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
Has your PR been rebased against the latest commit within the target branch (typically
develop)?Is your initial contribution a single, squashed commit?
Does
gradlew buildrun cleanly?Have you written or updated unit tests to verify your changes?
If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
Note:
Please ensure that once the PR is submitted, check Concourse for build issues and
submit an update to your PR as soon as possible. If you need help, please send an
email to dev@geode.apache.org.