SyncEngine: Fix detection of backup or full resync #5104
Merged
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
|
|
|
Does that go into 2.2.3 ? |
| @@ -681,6 +681,10 @@ void SyncEngine::startSync() | |||
| s_anySyncRunning = true; | |||
| _syncRunning = true; | |||
| _anotherSyncNeeded = false; | |||
| _hasNoneFiles = false; | |||
| _hasRemoveFile = false; | |||
There was a problem hiding this comment.
Those two are already reset in slotDiscoveryJobFinished
|
If you think this should go in 2.2.3, we should make sure that we give some time for the RC to be used by people, and we should do extra QA for it. We shouldn't just put land the patch and release the day after I think. |
|
OK let's have it in 2.2.3 and make a rc tomorrow.. |
Once upon a time, the SyncEngine was instantiated once per sync. But now that the SyncEngine is kept between sync, we need to reset all these variable between syncs.
ogoffart
force-pushed
the
backup-restore
branch
from
e13f2f7
to
5dc3d55
Compare
|
👍 |
|
👍 from me. |
|
@davitol FYI nightlies should have it |
ghost
mentioned this pull request
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.
Once upon a time, the SyncEngine was instantiated once per sync. But now that the SyncEngine is kept between sync, we need to reset all these variable between syncs.