Skip to content

samod-core: fix DontAnnounce policy drops documents synced by clients #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shikokuchuo wants to merge 1 commit into from
Closed

samod-core: fix DontAnnounce policy drops documents synced by clients #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions samod-core/src/actors/document/doc_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,18 @@ impl DocState {
// .add_on_disk(snapshots.into_keys().chain(incrementals.into_keys()));
if matches!(self.phase, Phase::Loading { .. }) {
if self.doc.get_heads().is_empty() {
let eligible_conns = peer_connections
// Check if there are pending sync messages from peers that may
// contain the document data. If so, we must process them before
// deciding the document is not found.
let pending_msg_count = if let Phase::Loading { pending_sync_messages } = &self.phase {
pending_sync_messages.values().map(|v| v.len()).sum::<usize>()
} else {
0
};
let eligible_conns = peer_connections
.values()
.any(|p| p.announce_policy() != AnnouncePolicy::DontAnnounce);
if eligible_conns || self.any_dialer_connecting {
if eligible_conns || self.any_dialer_connecting || pending_msg_count > 0 {
tracing::debug!(
eligible_conns,
self.any_dialer_connecting,
Expand Down
Loading