Repository navigation
fix(sync2): stop only the sender's log at a discarded object - #1651
Merged
1 commit merged intoNov 2, 2026
Merged
1 commit merged into
1 commit merged into
Conversation
There was a problem hiding this comment.
Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.
An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing.
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
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
One discarded object (signature, stream position, or content the merges can't read) aborted every sync without advancing, so one bad object from one device stopped all syncing for good. Now (spec/store.md "Untrusted input", Flow-Tube/flow-sync#75):
Session.readObjecttreats aProtocolExceptionlike a gap: that sender's log stops there and the other senders are still read.Session.readkeeps reading later pages for the other senders; the saved cursor stays at the first page with an unread object, so it is retried next sync.parseBatchchecks batches at read time (bad header, a record that isn't an object, a wrong-typed key, or a record the merges can't decode, through a newSyncSerialization.checkRecords) and reportsPAYLOAD, so a bad batch becomes a discard instead of an exception during apply.newestManifestsskips a discarded object.Related issue
Change type
Validation
./gradlew :app:assembleGithubDebug: not run on this branch; CI builds the APK./gradlew --offline :app:testGithubDebugUnitTest --tests 'io.github.aedev.flow.sync2.*' --tests 'io.github.aedev.flow.sync.*': 159 sync2 and 162 sync tests, 0 failures. New:SessionTest.a_tampered_object_stops_only_its_sender_s_log(replacesa_tampered_object_is_refused),a_batch_the_merges_cant_read_stops_only_its_sender_s_log_on_every_page,SnapshotsTest.a_new_device_starts_from_the_snapshot_behind_a_tampered_object. Before:ProtocolException: signature,JsonDecodingException,ProtocolException: signature./gradlew --offline ktlintCheck: passedTest device and Android version: not device-tested yet
Risk and compatibility
Nightly note added. A bad snapshot blob of the manifest chosen at bootstrap still fails that sync (Flow Desktop has the same limit).