mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-15 11:36:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: Immediately fail if a sliding sync request failed

Browse Source 
For sliding sync that starts both the actual sliding sync request along the e2ee requests,
we need to make sure that, in case of failure of sliding sync, we reset `pos` as soon as possible.
With the code before this patch, the sliding sync response might be available, but the whole
processing could be waiting for the e2ee requests to finish. In the updated version, we spawn
the e2ee requests in a background task, then run the sliding sync request immediately and fail
if it failed.

Another nice benefit is that the e2ee requests won't be interrupted in the middle of processing,
if the sliding sync changed parameters and we cancelled the whole sync a bit too early.

Fixes #2206.
This commit is contained in:
Benjamin Bouvier
2023-07-04 13:53:03 +02:00
committed by Ivan Enderlin
parent afeb5dab24
commit 1cd87ca15d
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/matrix-sdk/src/sliding_sync/mod.rs
View File

@@ -483,11 +483,23 @@ impl SlidingSync {
if self.inner.sticky.read().unwrap().data().extensions.e2ee.enabled == Some(true) {
debug!("Sliding Sync is sending the request along with outgoing E2EE requests");
let (e2ee_uploads, response) =
futures_util::future::join(self.inner.client.send_outgoing_requests(), request)
.await;
// If the sliding sync request fails faster than the e2ee requests get their
// responses, we want to fail as early as possible, so as to invalidate the
// sliding sync session as early as possible.
//
// Also, we don't want an interruption in the sliding sync request to abort
// processing of the e2ee response.
//
// For those reasons, start the e2ee requests in a background task.
if let Err(error) = e2ee_uploads {
let client = self.inner.client.clone();
let e2ee_uploads = spawn(async move { client.send_outgoing_requests().await });
// Wait on the sliding sync request success or failure early.
let response = request.await?;
// Then only log the e2ee response, if needs be.
if let Err(error) = e2ee_uploads.await {
error!(?error, "Error while sending outgoing E2EE requests");
}
@@ -495,9 +507,9 @@ impl SlidingSync {
} else {
debug!("Sliding Sync is sending the request (e2ee not enabled in this instance)");
request.await
request.await?
}
}?;
};
// Send the request and get a response _without_ end-to-end encryption support.
#[cfg(not(feature = "e2e-encryption"))]