CBL-5035 : Fix backgrounding logic to cover conflict resolution #3198
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
velicuvlad
approved these changes
Nov 9, 2023
bmeike
reviewed
Nov 9, 2023
|
Confirmed from the PM that this fix will go into 3.0.x branch. The fix will be ported to the other release branches. |
* The extending background task shouldn’t be ended if there are still pending conflict resolutions. * When the app was suspended by the background monitor, any current pending conflict resolutions should be canceled. All cancelled conflict resolutions will be notified and put into the queue again when the replicator is resumed or is restarted. * Fixed bug that the backgrounding monitor may not be restarted after it was ended. * Renamed some methods and add comments to code. * Added test to test suspending conflict resolution.
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.
The extending background task shouldn’t be ended if there are still pending conflict resolutions.
When the app was suspended by the background monitor, any current pending conflict resolutions should be canceled. All cancelled conflict resolutions will be notified and put into the queue again when the replicator is resumed or is restarted.
Fixed bug that the backgrounding monitor may not be restarted after it was ended.
Renamed some methods and add comments to code.
Added test to test suspending conflict resolution.