studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Turn non-monotonic next_batch assert into error log and clamp.

Browse Source
This commit is contained in:
dasha_uwu
2026-01-25 05:31:09 +05:00
committed by Jason Volk
parent daa869fced
commit a1960553e9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/client/sync/v3.rs
View File

@@ -37,7 +37,7 @@ use tokio::time;
use tuwunel_core::{ use tuwunel_core::{
Result, at, Result, at,
debug::INFO_SPAN_LEVEL, debug::INFO_SPAN_LEVEL,
err, debug_error, err,
error::{inspect_debug_log, inspect_log}, error::{inspect_debug_log, inspect_log},
extract_variant, is_equal_to, is_false, is_true, extract_variant, is_equal_to, is_false, is_true,
matrix::{ matrix::{
@@ -192,7 +192,10 @@ pub(crate) async fn sync_events_route(
.watch(sender_user, sender_device, watch_rooms); .watch(sender_user, sender_device, watch_rooms);
let next_batch = services.globals.wait_pending().await?; let next_batch = services.globals.wait_pending().await?;
debug_assert!(since <= next_batch, "next_batch is monotonic"); if since > next_batch {
debug_error!(since, next_batch, "received since > next_batch, clamping");
since = next_batch;
}
if since < next_batch || full_state { if since < next_batch || full_state {
let response = build_sync_events( let response = build_sync_events(
@@ -221,6 +224,7 @@ pub(crate) async fn sync_events_route(
if time::timeout_at(stop_at, watchers).await.is_err() || services.server.is_stopping() { if time::timeout_at(stop_at, watchers).await.is_err() || services.server.is_stopping() {
let response = let response =
build_empty_response(&services, sender_user, sender_device, next_batch).await; build_empty_response(&services, sender_user, sender_device, next_batch).await;
trace!(since, next_batch, "empty response"); trace!(since, next_batch, "empty response");
return Ok(response); return Ok(response);
} }