From 23ce334182d8a70f8e0381786f9dea77a9b91ed8 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 8 Jul 2021 16:36:51 +0100 Subject: [PATCH 1/3] Logging --- syncapi/consumers/roomserver.go | 1 + syncapi/sync/requestpool.go | 1 + 2 files changed, 2 insertions(+) diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go index a6aeee3a8b..8e63ed481c 100644 --- a/syncapi/consumers/roomserver.go +++ b/syncapi/consumers/roomserver.go @@ -194,6 +194,7 @@ func (s *OutputRoomEventConsumer) onNewRoomEvent( sentry.CaptureException(err) return err } + log.Infof("onNewRoomEvent -> %d: %+v", pduPos, msg) s.pduStream.Advance(pduPos) s.notifier.OnNewEvent(ev, ev.RoomID(), nil, types.StreamingToken{PDUPosition: pduPos}) diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go index a457361062..98df356328 100644 --- a/syncapi/sync/requestpool.go +++ b/syncapi/sync/requestpool.go @@ -244,6 +244,7 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi. ), } } + syncReq.Log.Infof("%s->%s : %+v", syncReq.Since, syncReq.Response.NextBatch, syncReq.Response) return util.JSONResponse{ Code: http.StatusOK, From a41ba7e149498f045b05eab04477c8fa0130a098 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 9 Jul 2021 10:20:24 +0100 Subject: [PATCH 2/3] Revert "Logging" This reverts commit 23ce334182d8a70f8e0381786f9dea77a9b91ed8. --- syncapi/consumers/roomserver.go | 1 - syncapi/sync/requestpool.go | 1 - 2 files changed, 2 deletions(-) diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go index 8e63ed481c..a6aeee3a8b 100644 --- a/syncapi/consumers/roomserver.go +++ b/syncapi/consumers/roomserver.go @@ -194,7 +194,6 @@ func (s *OutputRoomEventConsumer) onNewRoomEvent( sentry.CaptureException(err) return err } - log.Infof("onNewRoomEvent -> %d: %+v", pduPos, msg) s.pduStream.Advance(pduPos) s.notifier.OnNewEvent(ev, ev.RoomID(), nil, types.StreamingToken{PDUPosition: pduPos}) diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go index 98df356328..a457361062 100644 --- a/syncapi/sync/requestpool.go +++ b/syncapi/sync/requestpool.go @@ -244,7 +244,6 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi. ), } } - syncReq.Log.Infof("%s->%s : %+v", syncReq.Since, syncReq.Response.NextBatch, syncReq.Response) return util.JSONResponse{ Code: http.StatusOK, From db63873e86f73e840915b7c64d1b900fe6455f5c Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 9 Jul 2021 10:21:11 +0100 Subject: [PATCH 3/3] bugfix: order the state blocks so recreating state snapshots works correctly --- roomserver/storage/postgres/state_block_table.go | 2 +- roomserver/storage/sqlite3/state_block_table.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roomserver/storage/postgres/state_block_table.go b/roomserver/storage/postgres/state_block_table.go index 4523d18bb7..7ae987d6d4 100644 --- a/roomserver/storage/postgres/state_block_table.go +++ b/roomserver/storage/postgres/state_block_table.go @@ -64,7 +64,7 @@ const insertStateDataSQL = "" + const bulkSelectStateBlockEntriesSQL = "" + "SELECT state_block_nid, event_nids" + - " FROM roomserver_state_block WHERE state_block_nid = ANY($1)" + " FROM roomserver_state_block WHERE state_block_nid = ANY($1) ORDER BY state_block_nid ASC" type stateBlockStatements struct { insertStateDataStmt *sql.Stmt diff --git a/roomserver/storage/sqlite3/state_block_table.go b/roomserver/storage/sqlite3/state_block_table.go index cfb2a49e53..5cb21e91cb 100644 --- a/roomserver/storage/sqlite3/state_block_table.go +++ b/roomserver/storage/sqlite3/state_block_table.go @@ -57,7 +57,7 @@ const insertStateDataSQL = ` const bulkSelectStateBlockEntriesSQL = "" + "SELECT state_block_nid, event_nids" + - " FROM roomserver_state_block WHERE state_block_nid IN ($1)" + " FROM roomserver_state_block WHERE state_block_nid IN ($1) ORDER BY state_block_nid ASC" type stateBlockStatements struct { db *sql.DB