Skip to content

Conversation

@mejo-
Copy link
Member

@mejo- mejo- commented Jul 11, 2023

📝 Summary

Manual backport of #4474

max-nextcloud and others added 11 commits July 11, 2023 19:25
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Also only wait for `@alive` once in `syncs even when initial state was
present` to fix the test.

Signed-off-by: Jonas <[email protected]>
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 <[email protected]>
@cypress
Copy link

cypress bot commented Jul 11, 2023

1 failed and 1 flaky tests on run #10964 ↗︎

1 146 2 0 Flakiness 1

Details:

[stable26] Fix sync errors after network issues
Project: Text Commit: dda9034f25
Status: Failed Duration: 04:03 💡
Started: Jul 11, 2023 8:19 PM Ended: Jul 11, 2023 8:23 PM
Failed  cypress/e2e/sync.spec.js • 1 failed test

View Output Video

Test Artifacts
Sync > recovers from a lost connection Output Screenshots
Flakiness  cypress/e2e/share.spec.js • 1 flaky test

View Output Video

Test Artifacts
Open test.md in viewer > Share a file with download disabled shows an error Output Screenshots

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@mejo-
Copy link
Member Author

mejo- commented Jul 11, 2023

/compile

Signed-off-by: nextcloud-command <[email protected]>
@mejo- mejo- merged commit 03223e1 into stable26 Jul 11, 2023
@delete-merged-branch delete-merged-branch bot deleted the backport/4474/stable26 branch July 11, 2023 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants