-
Notifications
You must be signed in to change notification settings - Fork 203
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
Fix and Cover Eager Conflict Resolution Deadlock #674
Open
matt-ramotar
wants to merge
21
commits into
matt-ramotar/turbine
Choose a base branch
from
matt-ramotar/eager-conflict-resolution
base: matt-ramotar/turbine
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix and Cover Eager Conflict Resolution Deadlock #674
matt-ramotar
wants to merge
21
commits into
matt-ramotar/turbine
from
matt-ramotar/eager-conflict-resolution
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
matt-ramotar
force-pushed
the
matt-ramotar/eager-conflict-resolution
branch
from
November 18, 2024 01:22
5d7ffca
to
6ebaf2b
Compare
matt-ramotar
force-pushed
the
matt-ramotar/eager-conflict-resolution
branch
from
November 24, 2024 05:51
9dd28e7
to
37019fd
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## matt-ramotar/turbine #674 +/- ##
========================================================
+ Coverage 75.43% 77.82% +2.39%
========================================================
Files 38 40 +2
Lines 920 929 +9
Branches 169 171 +2
========================================================
+ Hits 694 723 +29
+ Misses 142 124 -18
+ Partials 84 82 -2
|
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
This reverts commit f94a8aa. Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
This reverts commit f9379b2. Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
Signed-off-by: matt-ramotar <matt.ramotar@uber.com>
matt-ramotar
force-pushed
the
matt-ramotar/eager-conflict-resolution
branch
from
November 27, 2024 18:10
8c96093
to
26791af
Compare
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.
Depends on #672
Closes #667
Closes #578
This PR is fixing a deadlock in eager conflict resolution. To improve testability, this PR also:
RealMutableStore
Turbine
andMokkery