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.

Sign up for GitHub

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

Jump to bottom

Fix and Cover Eager Conflict Resolution Deadlock #674

Open
wants to merge 21 commits into
base: matt-ramotar/turbine
Choose a base branch
from
Open

Fix and Cover Eager Conflict Resolution Deadlock #674

wants to merge 21 commits into from

Conversation

matt-ramotar
Copy link
Collaborator

@matt-ramotar matt-ramotar commented Nov 18, 2024 •
edited
Loading

Depends on #672

Closes #667
Closes #578

This PR is fixing a deadlock in eager conflict resolution. To improve testability, this PR also:

  • Extracts logging into an interface and provides a default implementation to the RealMutableStore
  • Adds dependencies on Turbine and Mokkery

@matt-ramotar matt-ramotar force-pushed the matt-ramotar/eager-conflict-resolution branch from 5d7ffca to 6ebaf2b Compare November 18, 2024 01:22
@matt-ramotar matt-ramotar force-pushed the matt-ramotar/eager-conflict-resolution branch from 9dd28e7 to 37019fd Compare November 24, 2024 05:51
@codecov Codecov
Copy link

codecov bot commented Nov 24, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 86.84211% with 5 lines in your changes missing coverage. Please review.

Project coverage is 77.82%. Comparing base (f76e371) to head (26791af).

Files with missing lines Patch % Lines
...vefoundation/store/store5/impl/RealMutableStore.kt 86.20% 1 Missing and 3 partials ⚠️
...ativefoundation/store/store5/impl/DefaultLogger.kt 85.71% 1 Missing ⚠️
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
Files with missing lines Coverage Δ
.../org/mobilenativefoundation/store/store5/Logger.kt 100.00% <100.00%> (ø)
...ilenativefoundation/store/store5/impl/RealStore.kt 88.72% <100.00%> (ø)
...ativefoundation/store/store5/impl/DefaultLogger.kt 85.71% <85.71%> (ø)
...vefoundation/store/store5/impl/RealMutableStore.kt 71.65% <86.20%> (+11.33%) ⬆️

... and 2 files with indirect coverage changes

@matt-ramotar
Run codecov on PR and push
cb8fc1e 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Move util to test_utils
2e27c19 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Add Logger interface
5b4e2f9 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Add default implementation of Logger
6d24f54 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Constructor inject logger
94e0cd7 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Change visibility of DefaultLogger
8ff8336 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Make RealStore open for testing
41bf079 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Opt into ExperimentalStoreApi
de043fd 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Add stream_givenConflicts_whenExceptionResolvingConflicts_thenShouldLog
50238ef 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Add TODO
d35f0c1 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
stream_givenConflicts_whenErrorMessageResolvingConflicts_thenShouldLog
676fc76 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Add Turbine
5c7013a 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Fix #667
1e0b235 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Add EagerConflictResolutionTests
5f95999 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Revert "Move util to test_utils"
10cede5 
This reverts commit f94a8aa.

Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Revert "Run codecov on PR and push"
fdcd236 
This reverts commit f9379b2.

Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Run ./gradlew ktlintFormat
d3ab12d 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Run ./gradlew :store:apiDump
e6566f7 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Configure kover for :store
e2e4c17 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Format
0d9652b 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar
Revert changes to .codecov.yml
26791af 
Signed-off-by: matt-ramotar <[email protected]>
@matt-ramotar matt-ramotar force-pushed the matt-ramotar/eager-conflict-resolution branch from 8c96093 to 26791af Compare November 27, 2024 18:10
@matt-ramotar matt-ramotar changed the base branch from main to matt-ramotar/turbine November 27, 2024 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@digitalbuddha digitalbuddha Awaiting requested review from digitalbuddha

Assignees
No one assigned
Labels
None yet
Projects
Store Roadmap
Status: 🆕 Triage
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG] Deadlock in tryEagerlyResolveConflicts [BUG] Deadlock during synchronization in MutableStore
1 participant
@matt-ramotar