chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: try to fix inifinite sync (#756)

This commit is contained in:
Nathan.fooo 2024-08-27 16:41:19 +08:00 committed by GitHub
parent ed2a3fd1ee
commit c8ee6b43ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/client-api/src/collab_sync/sync_control.rs
View File

@ -222,7 +222,7 @@ where
}, },
Some(sv) => { Some(sv) => {
trace!( trace!(
"🔥{} start init sync, reason:{}", "🔥{} start init sync with state vector, reason:{}",
&sync_object.object_id, &sync_object.object_id,
reason reason
); );

2
libs/collab-rt-protocol/src/message.rs
View File

@ -258,7 +258,7 @@ pub enum RTProtocolError {
#[error("Missing Updates")] #[error("Missing Updates")]
MissUpdates { MissUpdates {
/// - `state_vector_v1`: Contains the last known state vector from the client. If `None`, /// - `state_vector_v1`: Contains the last known state vector from the Collab. If `None`,
/// this indicates that the receiver needs to perform a full initialization synchronization starting from sync step 0. /// this indicates that the receiver needs to perform a full initialization synchronization starting from sync step 0.
/// ///
/// The receiver uses this information to determine how to recover from the error, /// The receiver uses this information to determine how to recover from the error,

4
libs/collab-rt-protocol/src/protocol.rs
View File

@ -68,9 +68,9 @@ impl CollabSyncProtocol for ClientSyncProtocol {
update.missing.is_empty() update.missing.is_empty()
); );
} }
// let state_vector_v1 = update.missing.encode_v1(); let state_vector_v1 = txn.state_vector().encode_v1();
Err(RTProtocolError::MissUpdates { Err(RTProtocolError::MissUpdates {
state_vector_v1: None, state_vector_v1: Some(state_vector_v1),
reason: "client miss updates".to_string(), reason: "client miss updates".to_string(),
}) })
}, },

3
services/appflowy-collaborate/src/group/protocol.rs
View File

@ -67,8 +67,9 @@ impl CollabSyncProtocol for ServerSyncProtocol {
// let state_vector_v1 = update.missing.encode_v1(); // let state_vector_v1 = update.missing.encode_v1();
// for the moment, we don't need to send missing updates to the client. passing None // for the moment, we don't need to send missing updates to the client. passing None
// instead, which will trigger a sync step 0 on client // instead, which will trigger a sync step 0 on client
let state_vector_v1 = txn.state_vector().encode_v1();
Err(RTProtocolError::MissUpdates { Err(RTProtocolError::MissUpdates {
state_vector_v1: None, state_vector_v1: Some(state_vector_v1),
reason: "server miss updates".to_string(), reason: "server miss updates".to_string(),
}) })
}, },