fix(conflict): resolve quickly with fast sync. #4076
Merged
Conversation
This file contains hidden or 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
Collaborator
Author
|
/backport 8114c69 to stable26 |
3 flaky tests on run #9494 ↗︎
Details:
|
|||||||||||||||||||||||||||||||||
| Test | Artifacts | |
|---|---|---|
| Sync > recovers from a lost connection |
Output
Screenshots
|
|
share.spec.js • 1 flaky test
| Test | Artifacts | |
|---|---|---|
| Open test.md in viewer > Share a file with download disabled shows an error |
Output
Screenshots
|
|
conflict.spec.js • 1 flaky test
| Test | Artifacts | |
|---|---|---|
| Open test.md in viewer > resolves conflict using server version |
Output
Screenshots
|
|
This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.
Fixes #4075. * Speed up the sync for one request AFTER the force save. Otherwise the `PollingBackend` will poll only once every 5 seconds when only one user is connected. * The `$syncService.startSync()` had no effect as it tried to reconnect an already connected backend. Signed-off-by: Max <[email protected]>
max-nextcloud
force-pushed
the
perf/fast-conflict-resolution
branch
from
8114c69 to
4a7106c
Compare
Collaborator
Author
|
/compile |
Signed-off-by: nextcloud-command <[email protected]>
|
The backport to stable26 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable26
git pull origin/stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
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.
📝 Summary
PollingBackendwill poll only once every 5 seconds when only one user is connected.$syncService.startSync()had no effect as it tried to reconnect an already connected backend.🏁 Checklist
npm run lint/npm run stylelint/composer run cs:check)