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

Fix existing event reinsertions during backfill handling.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-11-18 17:18:43 +00:00
parent dafbe59d00
commit 6f29a34ffb
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/service/rooms/timeline/backfill.rs
View File

@@ -14,7 +14,7 @@ use ruma::{
}; };
use serde_json::value::RawValue as RawJsonValue; use serde_json::value::RawValue as RawJsonValue;
use tuwunel_core::{ use tuwunel_core::{
Result, debug, debug_info, debug_warn, implement, is_false, Result, at, debug, debug_info, debug_warn, implement, is_false,
matrix::{ matrix::{
event::Event, event::Event,
pdu::{PduCount, PduId, RawPduId}, pdu::{PduCount, PduId, RawPduId},
@@ -177,11 +177,19 @@ pub async fn backfill_pdu(
let ((_, event_id, value), mutex_lock) = try_join(parsed, mutex_lock).await?; let ((_, event_id, value), mutex_lock) = try_join(parsed, mutex_lock).await?;
self.services let existed = self
.services
.event_handler .event_handler
.handle_incoming_pdu(origin, room_id, &event_id, value, false) .handle_incoming_pdu(origin, room_id, &event_id, value, false)
.boxed() .boxed()
.await?; .await?
.map(at!(1))
.is_some_and(is_false!());
// Bail if the PDU already exists; a duplicate insertion is not good.
if existed {
return Ok(());
}
let pdu = self.get_pdu(&event_id); let pdu = self.get_pdu(&event_id);
@@ -194,6 +202,8 @@ pub async fn backfill_pdu(
let (pdu, value, shortroomid, insert_lock) = let (pdu, value, shortroomid, insert_lock) =
try_join4(pdu, value, shortroomid, insert_lock).await?; try_join4(pdu, value, shortroomid, insert_lock).await?;
// A pdu_id is not returned from handle_incoming_pdu() when accepting a new
// event on this codepath. The pdu_id is instead created here in ℤ−
let count = self.services.globals.next_count(); let count = self.services.globals.next_count();
let count: i64 = (*count).try_into()?; let count: i64 = (*count).try_into()?;
let pdu_id: RawPduId = PduId { let pdu_id: RawPduId = PduId {