magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: stuck messages

Browse source 
Conduit did not send the event in /sync because of a race condition.
There is a brief moment in time where Conduit accepted the event, but
did not store it yet. So when the client /syncs it updates the since
token without sending the event. I hope I fixed it by significantly
shortening the race-condition period.
This commit is contained in:
Timo Kösters 2021-07-01 11:06:05 +02:00
parent 8c44312485
commit 1c25492a7e
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
4 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server_server.rs
View file

@ -1579,21 +1579,14 @@ pub(crate) fn append_incoming_pdu(
new_room_leaves: HashSet<EventId>,
state: &StateMap<Arc<PduEvent>>,
) -> Result<Vec<u8>> {
let count = db.globals.next_count()?;
let mut pdu_id = pdu.room_id.as_bytes().to_vec();
pdu_id.push(0xff);
pdu_id.extend_from_slice(&count.to_be_bytes());
// We append to state before appending the pdu, so we don't have a moment in time with the
// pdu without it's state. This is okay because append_pdu can't fail.
db.rooms
.set_event_state(&pdu.event_id, state, &db.globals)?;
db.rooms.append_pdu(
let pdu_id = db.rooms.append_pdu(
pdu,
pdu_json,
count,
&pdu_id,
&new_room_leaves.into_iter().collect::<Vec<_>>(),
&db,
)?;