From 0d0dd3dcb9fb92ffc652cf833ad9d2fcce9f36d1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 30 Oct 2023 10:32:28 +0000 Subject: [PATCH 1/2] Fix HTTP repl response to use minimum token --- synapse/replication/http/_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/replication/http/_base.py b/synapse/replication/http/_base.py index 7476839db584..38701aea7240 100644 --- a/synapse/replication/http/_base.py +++ b/synapse/replication/http/_base.py @@ -433,7 +433,7 @@ async def _check_auth_and_handle( if self.WAIT_FOR_STREAMS: response[_STREAM_POSITION_KEY] = { - stream.NAME: stream.current_token(self._instance_name) + stream.NAME: stream.minimal_local_current_token() for stream in self._streams } From 414fdf6bd4001e7b318133c2122dd8832a73f860 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 30 Oct 2023 10:36:22 +0000 Subject: [PATCH 2/2] Newsfile --- changelog.d/16578.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/16578.bugfix diff --git a/changelog.d/16578.bugfix b/changelog.d/16578.bugfix new file mode 100644 index 000000000000..4f4a0380cd77 --- /dev/null +++ b/changelog.d/16578.bugfix @@ -0,0 +1 @@ +Fix a long-standing, exceedingly rare edge case where the first event persisted by a new event persister worker might not be sent down `/sync`.