MSC4354: Sticky Events #18968

kegsay · 2025-09-24T13:30:21Z

This implements MSC4354: Sticky Events. To enable it, set this in homeserver.yaml:

experimental_features:
    msc4354_enabled: true

Complement tests: matrix-org/complement#806

Pull Request Checklist

Pull request is based on the develop branch
Pull request includes a changelog file. The entry should:
- Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
- Use markdown where necessary, mostly for code blocks.
- End with either a period (.) or an exclamation mark (!).
- Start with a capital letter.
- Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
Code style is correct (run the linters)

This only works on postgres for now

Persist inside persist_events to guarantee it is done. After that txn, recheck soft failure.

MadLittleMods

Looked everything over but didn't full evaluate the sticky events part against the MSC or fully ponder weird corners.

MadLittleMods · 2025-09-26T21:17:35Z

synapse/events/builder.py


    content: JsonDict = attr.Factory(dict)
    unsigned: JsonDict = attr.Factory(dict)
+    sticky: Optional[StickyEventField] = None


Suggested change

sticky: Optional[StickyEventField] = None

sticky: Optional[StickyEventField] = None

"""

TODO

"""

It would be good to add a docstring to indicate where this is from and what's used for.

MadLittleMods · 2025-09-26T21:20:39Z

synapse/federation/federation_base.py

+            # Mark this as spam so we don't re-evaluate soft-failure status.
+            redacted_event.internal_metadata.policy_server_spammy = True


Seems unrelated to sticky events

It's related because spam is currently flagged in Synapse via soft-failure, and sometimes via policy_server_spammy. As this PR is re-evaluating soft-failed events, we want to make sure we don't re-evaluate spam, hence need to distinguish it.

MadLittleMods · 2025-09-26T21:23:54Z

synapse/handlers/sliding_sync/extensions.py

+        if not sticky_events_request.enabled:
+            return None
+        now = self.clock.time_msec()
+        from_id = from_token.stream_token.sticky_events_key if from_token else 0


Should we copy this pattern?

synapse/synapse/handlers/sliding_sync/extensions.py

Lines 928 to 931 in 2f2b854

if from_token:

from_stream_id = from_token.stream_token.thread_subscriptions_key

else:

from_stream_id = StreamToken.START.thread_subscriptions_key

synapse/handlers/sliding_sync/extensions.py

MadLittleMods · 2025-09-26T21:35:42Z

synapse/handlers/delayed_events.py

            content: The content of the event to be sent.
            delay: How long (in milliseconds) to wait before automatically sending the event.
-
+            sticky_duration_ms: The sticky duration if any, see MSC4354.


I think this could be expanded a bit to explain what it means without having to look at MSC4354. I have to make a lot of assumptions otherwise.

"Time since xxx that the event should appear in xxx"

MadLittleMods · 2025-09-26T21:59:56Z

synapse/storage/databases/main/sticky_events.py

+# Consumers call 'get_sticky_events_in_rooms' which has `WHERE expires_at > ?`
+# to filter out expired sticky events that have yet to be deleted.
+DELETE_EXPIRED_STICKY_EVENTS_MS = 60 * 1000 * 60  # 1 hour
+MAX_STICKY_DURATION_MS = 3600000  # 1 hour


In the client event creation, we should be preventing creating events that have duration greater than MAX_STICKY_DURATION_MS

MadLittleMods · 2025-09-26T22:00:15Z

synapse/storage/databases/main/sticky_events.py

+            if (
+                type(sticky_duration_ms) is int
+                and sticky_duration_ms >= 0
+                and sticky_duration_ms <= MAX_STICKY_DURATION_MS


Silently ignoring events with a duration greater than the MAX_STICKY_DURATION_MS seems a bit dubious. Is that correct? We should explain why that's fine.

If created locally, we should return an error as per your earlier comment. Over federation, no auth rule forbids a high duration (the field itself isn't even protected from redaction) so we have to continue processing the event. We obviously don't want to action a long duration, so silently ignoring is the right thing to do in this particular case.

MadLittleMods · 2025-09-26T22:02:59Z

synapse/storage/databases/main/sticky_events.py

+        critical_auth_types = (
+            EventTypes.JoinRules,
+            EventTypes.PowerLevels,
+            EventTypes.Member,
+        )


Wondering how this plays with room versions. Do we need to be careful at all with forward compatibility, etc?

Should we be using auth_types_for_event instead?

I don't think we need to be that careful here. We will need to keep this updated if we make new room versions which break the current auth model though.

MadLittleMods · 2025-09-26T22:06:56Z

synapse/types/__init__.py

        9. `groups_key`: `1` (note that this key is now unused)
        10. `un_partial_stated_rooms_key`: `379`
        11. `thread_subscriptions_key`: 4242
+        12. `sticky_events_key`: 4141


Add it to the full example token above

MadLittleMods · 2025-09-26T22:07:28Z

tests/federation/test_federation_catch_up.py

+
+        # now we send a sticky event that we expect to be bundled with the fwd extrem event
+        sticky_event_id = self.helper.send_sticky_event(
+            room_1, "m.room.sticky", 60000, tok=u1_token


60000 is obtuse. Would be nice to have a labeled variable

Currently emits on joins and logs on receive, WIP.

…invalidate

Process those sticky events as well. In so doing, fixes #18563 because we now have the room_creator as an update value not insert value.

…ing the need for a tri-state soft failure flag

kegsay added 14 commits September 18, 2025 14:33

WIP MSC4354; stub out soft-failure code for now

abf658c

Persist sticky events in sticky_events table

8699534

This only works on postgres for now

Use multi-writer streams for sticky events

7801e68

Hook up replication receiver, add sticky events to sync tokens

e01a22b

Insert sticky events into /sync responses

3e7a5a6

Don't include expired sticky events in /sync responses

7af7429

Delete from sticky_events periodically

0cfdd0d

Get sticky events working with Simplified Sliding Sync

7c8daf4

Support MSC4140 Delayed Events with sticky events

ac0f8c2

Fix sqlite

1e812e4

Re-evaluate soft-failure on sticky events

2728b21

Don't re-evaluate spam

666e94b

Rejig when we persist sticky events

771692a

Persist inside persist_events to guarantee it is done. After that txn, recheck soft failure.

Update docs to not lie

ad6a2b9

kegsay requested a review from a team as a code owner September 24, 2025 13:30

kegsay mentioned this pull request Sep 24, 2025

MSC4354: Sticky Events matrix-org/matrix-spec-proposals#4354

Open

4 tasks

kegsay marked this pull request as draft September 24, 2025 13:30

MadLittleMods mentioned this pull request Sep 25, 2025

Improve documentation around streams, particularly ID generators and adding new streams. #18943

Open

kegsay added 2 commits September 26, 2025 09:29

Send sticky events when catching up over federation

33d80be

Fix trial tests

148caef

MadLittleMods reviewed Sep 26, 2025

View reviewed changes

kegsay added 9 commits September 29, 2025 16:26

Add msc4354_sticky_duration_ttl_ms support

de3e9b4

Merge branch 'develop' into kegan/sticky-events

105d2cd

Use standard unstable identifiers

651e829

Don't persist sticky outliers

4acc98d

SQLite specific soft-failure update code

78c4097

JSON false not str

15453d4

Add msc4354 to /versions response

aa45bf7

Add NewServerJoined replication command

888ab79

Currently emits on joins and logs on receive, WIP.

Use a tri-state for soft failed to communicate when we need to cache …

aac3c84

…invalidate

kegsay added 2 commits October 3, 2025 11:35

Send sticky events to newly joined servers.

075312c

Process those sticky events as well. In so doing, fixes #18563 because we now have the room_creator as an update value not insert value.

Always cache invalidate when receiving sticky event updates, so remov…

7f1e057

…ing the need for a tri-state soft failure flag

MadLittleMods mentioned this pull request Oct 3, 2025

MSC4354: Sticky Events matrix-org/complement#806

Open

1 task

Send NEW_SERVER_JOINED at the right time

58bf128

kegsay marked this pull request as ready for review October 6, 2025 13:22

kegsay changed the title ~~[WIP] MSC4354: Sticky Events~~ MSC4354: Sticky Events Oct 6, 2025

kegsay added 8 commits October 6, 2025 14:28

Changelog

686ce52

Appease the regexp on delta lint checks

4def404

Add chunking for /sync, not SSS

adb601b

Merge branch 'develop' into kegan/sticky-events

b1af5fe

Linting

f0689ce

Fix query param name

b2c967f

Linting

4d02a4c

Run MSC4354 tests

a4cac85

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

MSC4354: Sticky Events #18968

MSC4354: Sticky Events #18968

kegsay commented Sep 24, 2025 •

edited

Loading

Uh oh!

MadLittleMods left a comment

Uh oh!

MadLittleMods Sep 26, 2025

Uh oh!

MadLittleMods Sep 26, 2025

Uh oh!

kegsay Sep 30, 2025

Uh oh!

MadLittleMods Sep 26, 2025

Uh oh!

Uh oh!

MadLittleMods Sep 26, 2025

Uh oh!

MadLittleMods Sep 26, 2025

Uh oh!

MadLittleMods Sep 26, 2025

Uh oh!

kegsay Sep 30, 2025

Uh oh!

MadLittleMods Sep 26, 2025

Uh oh!

MadLittleMods Sep 26, 2025

Uh oh!

kegsay Sep 30, 2025

Uh oh!

MadLittleMods Sep 26, 2025

Uh oh!

MadLittleMods Sep 26, 2025

Uh oh!

Uh oh!

		# Mark this as spam so we don't re-evaluate soft-failure status.
		redacted_event.internal_metadata.policy_server_spammy = True

	if from_token:
	from_stream_id = from_token.stream_token.thread_subscriptions_key
	else:
	from_stream_id = StreamToken.START.thread_subscriptions_key

MSC4354: Sticky Events #18968

Are you sure you want to change the base?

MSC4354: Sticky Events #18968

Conversation

kegsay commented Sep 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Checklist

Uh oh!

MadLittleMods left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kegsay commented Sep 24, 2025 •

edited

Loading