CBL-5074 : Fix backgrounding logic to cover conflict resolution #3226
Conversation
pasin
force-pushed
the
fix/CBL-5074
branch
2 times, most recently
from
a6c7ffc to
ccb553a
Compare
* 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.
| @@ -351,6 +351,12 @@ | |||
| 27F9619A1ED8D9440060F804 /* CBLReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 27F961971ED8D9440060F804 /* CBLReachability.h */; }; | |||
| 27F9619B1ED8D9440060F804 /* CBLReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F961981ED8D9440060F804 /* CBLReachability.m */; }; | |||
| 27F9619C1ED8D9440060F804 /* CBLReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F961981ED8D9440060F804 /* CBLReachability.m */; }; | |||
| 40BC51EF2AFC39ED0090EDD5 /* CouchbaseLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9343F00F207D611600F19A89 /* CouchbaseLite.framework */; }; | |||
There was a problem hiding this comment.
What are these things? I've seen them enough, now, so that I'm pretty curious.
There was a problem hiding this comment.
It's CouchbaseLite framework used in the test project. XCode 15 just moves the line that defines that in the project file. It's fine there.
| @@ -379,6 +386,15 @@ - (void) safeBlock:(void (^)())block { | |||
| } | |||
| } | |||
|
|
|||
| // Always being called inside the lock | |||
| - (void) idled { | |||
| Assert(_rawStatus.level == kC4Idle); | |||
There was a problem hiding this comment.
Also curious about this...
What does "Assert" do? Does it throw? Does it throw only if debugging?
There was a problem hiding this comment.
We have a config to disable the exception thrown in release mode. I have never tested the config so I think it's a good idea to test it.
There was a problem hiding this comment.
It turns out Assert() always thrown. We have used them everywhere in Objective-C code. I will leave the code as is and will have separate ticket to review them all to see which ones we want to throw only in debug mode.
Cherry-Picked the fixes from lithium branch (9f194b8 and 0f33a19) for CBSE-15077. There were conflicts during the cherry-pick but they are easy to resolve. Below are the commit messages copied from the original fixes.
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.
(Additional Commit) Fix EE Test build error when using XCode 15 and a flaky condition in testCollectionConflictResolver test.