[stable27] Fix sync errors after network issues #4486
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
Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Max <max@nextcloud.com>
Also drop the `sending` logic from `WebsocketPolyfill`. It prevented resending the queue after an error. The queue was non empty then so `this.#initiateSending()` was not called. `SyncService` is responsible for throttling the network requests if needed. Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Max <max@nextcloud.com>
This way the calling function can catch all network errors and make sure to preserve the unsent steps in the queue. Signed-off-by: Max <max@nextcloud.com>
SyncService will resend failed steps after network has recovered. Remove obsolete `data.retry` flag when emitting error of `ERROR_TYPE.CONNECTION_FAILED`. Fixes: #4340 Signed-off-by: Jonas <jonas@freesources.org>
Also only wait for `@alive` once in `syncs even when initial state was present` to fix the test. Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Max <max@nextcloud.com>
This is required for Cypress tests where we want the broadcast channel synchronization to be disabled. If not passed, default to `true` in debug mode and `false` otherwise. Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Jonas <jonas@freesources.org>
|
/compile |
1 failed and 1 flaky tests on run #10961 ↗︎
Details:
|
|||||||||||||||||||||||||||
| Test | Artifacts | |
|---|---|---|
| Sync > recovers from a lost connection |
Output
Screenshots
|
|
cypress/e2e/sync.spec.js • 1 flaky test
| Test | Artifacts | |
|---|---|---|
| Sync > saves the actual file and document state |
Output
Screenshots
|
|
This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.
7 tasks
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
juliushaertl
approved these changes
Jul 11, 2023
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
Manual backport of #4474