Skip to content

Revert "Fix state not showing up fast enough with TestDelayedEvents (#865)"#867

Merged
MadLittleMods merged 1 commit into
mainfrom
madlittlemods/revert-865
Apr 28, 2026
Merged

Revert "Fix state not showing up fast enough with TestDelayedEvents (#865)"#867
MadLittleMods merged 1 commit into
mainfrom
madlittlemods/revert-865

Conversation

@MadLittleMods
Copy link
Copy Markdown
Collaborator

@MadLittleMods MadLittleMods commented Apr 28, 2026 •
edited
Loading

Revert #865 as I jumped the gun after I got approval.

The test doesn't actually pass yet which was a possible outcome since I said:

I haven't actually checked whether this PR fixes the problem there (just theory)

Dev notes

COMPLEMENT_DIR=../complement ./scripts-dev/complement.sh -run TestDelayedEvents/delayed_state_events_are_kept_on_server_restart
...
=== RUN   TestDelayedEvents
2026/04/28 10:41:12 Sharing [SERVER_NAME=hs1 SYNAPSE_LOG_TESTING=1 SYNAPSE_COMPLEMENT_USE_WORKERS= SYNAPSE_COMPLEMENT_DATABASE=sqlite] host environment variables with container
    client.go:860: [CSAPI] POST hs1/_matrix/client/v3/register => 200 OK (119.846655ms)
    client.go:860: [CSAPI] POST hs1/_matrix/client/v3/register => 200 OK (109.988701ms)
    client.go:860: [CSAPI] POST hs1/_matrix/client/v3/createRoom => 200 OK (399.343873ms)
    client.go:860: [CSAPI] POST hs1/_matrix/client/v3/join/!eFHFYeCzmVnzXjRzkc:hs1 => 200 OK (168.784729ms)
=== RUN   TestDelayedEvents/delayed_state_events_are_kept_on_server_restart
=== NAME  TestDelayedEvents
    client.go:860: [CSAPI] GET hs1/_matrix/client/v3/sync => 200 OK (68.962216ms)
    client.go:860: [CSAPI] PUT hs1/_matrix/client/v3/rooms/!eFHFYeCzmVnzXjRzkc:hs1/state/com.example.test/1 => 200 OK (10.306259ms)
    client.go:860: [CSAPI] PUT hs1/_matrix/client/v3/rooms/!eFHFYeCzmVnzXjRzkc:hs1/state/com.example.test/2 => 200 OK (10.009426ms)
    client.go:860: [CSAPI] PUT hs1/_matrix/client/v3/rooms/!eFHFYeCzmVnzXjRzkc:hs1/state/com.example.test/3 => 200 OK (10.216832ms)
    client.go:860: [CSAPI] PUT hs1/_matrix/client/v3/rooms/!eFHFYeCzmVnzXjRzkc:hs1/state/com.example.test/4 => 200 OK (9.972808ms)
    client.go:860: [CSAPI] PUT hs1/_matrix/client/v3/rooms/!eFHFYeCzmVnzXjRzkc:hs1/state/com.example.test/5 => 200 OK (9.828299ms)
    client.go:860: [CSAPI] GET hs1/_matrix/client/unstable/org.matrix.msc4140/delayed_events => 200 OK (1.037622ms)
=== NAME  TestDelayedEvents/delayed_state_events_are_kept_on_server_restart
    delayed_event_test.go:430: StopServer hs1
    delayed_event_test.go:434: StartServer hs1
=== NAME  TestDelayedEvents
    client.go:860: [CSAPI] GET hs1/_matrix/client/unstable/org.matrix.msc4140/delayed_events => 200 OK (4.170123ms)
    client.go:860: [CSAPI] GET hs1/_matrix/client/v3/sync => 200 OK (9.541304ms)
    client.go:860: [CSAPI] GET hs1/_matrix/client/v3/sync => 200 OK (1.004062489s)
    client.go:860: [CSAPI] GET hs1/_matrix/client/v3/sync => 200 OK (261.778698ms)
    client.go:860: [CSAPI] GET hs1/_matrix/client/v3/sync => 200 OK (1.003701897s)
    client.go:860: [CSAPI] GET hs1/_matrix/client/v3/sync => 200 OK (1.00386416s)
    client.go:860: [CSAPI] GET hs1/_matrix/client/v3/sync => 200 OK (1.00362875s)
    client.go:860: [CSAPI] GET hs1/_matrix/client/v3/sync => 200 OK (1.004212426s)
=== NAME  TestDelayedEvents/delayed_state_events_are_kept_on_server_restart
    delayed_event_test.go:448: @user-1:hs1 MustSyncUntil: timed out after 5.291597479s. Seen 7 /sync responses. Checkers:
        [t=9.62996ms] Response #1: SyncStateHas(!eFHFYeCzmVnzXjRzkc:hs1): check function did not pass while iterating over 0 elements: []
        [t=1.013801461s] Response #2: SyncStateHas(!eFHFYeCzmVnzXjRzkc:hs1): Key rooms.join.!eFHFYeCzmVnzXjRzkc:hs1.state.events does not exist
        [t=1.275687059s] Response #3: SyncStateHas(!eFHFYeCzmVnzXjRzkc:hs1): check function did not pass while iterating over 0 elements: []
        [t=2.279498379s] Response #4: SyncStateHas(!eFHFYeCzmVnzXjRzkc:hs1): Key rooms.join.!eFHFYeCzmVnzXjRzkc:hs1.state.events does not exist
        [t=3.283492931s] Response #5: SyncStateHas(!eFHFYeCzmVnzXjRzkc:hs1): Key rooms.join.!eFHFYeCzmVnzXjRzkc:hs1.state.events does not exist
        [t=4.287246344s] Response #6: SyncStateHas(!eFHFYeCzmVnzXjRzkc:hs1): Key rooms.join.!eFHFYeCzmVnzXjRzkc:hs1.state.events does not exist
        [t=5.291595926s] Response #7: SyncStateHas(!eFHFYeCzmVnzXjRzkc:hs1): Key rooms.join.!eFHFYeCzmVnzXjRzkc:hs1.state.events does not exist, 
        
=== NAME  TestDelayedEvents
    client.go:860: [CSAPI] GET hs1/_matrix/client/unstable/org.matrix.msc4140/delayed_events => 200 OK (1.128721ms)
    client.go:860: [CSAPI] POST hs1/_matrix/client/unstable/org.matrix.msc4140/delayed_events/syd_BUeEAMZqVUiMQVHcbrHb/cancel => 200 OK (10.199249ms)
    client.go:860: [CSAPI] POST hs1/_matrix/client/unstable/org.matrix.msc4140/delayed_events/syd_DygPoWaFlRLIKGqZGVtg/cancel => 200 OK (10.216842ms)
    client.go:860: [CSAPI] POST hs1/_matrix/client/unstable/org.matrix.msc4140/delayed_events/syd_EtLNMMaTpNdUJRKjxWqW/cancel => 200 OK (10.909402ms)
    client.go:860: [CSAPI] GET hs1/_matrix/client/unstable/org.matrix.msc4140/delayed_events => 200 OK (912.018µs)
...
--- FAIL: TestDelayedEvents (22.52s)
    --- FAIL: TestDelayedEvents/delayed_state_events_are_kept_on_server_restart (14.18s)
FAIL
FAIL    github.com/matrix-org/complement/tests/msc4140  23.589s
FAIL

Pull Request Checklist

@MadLittleMods MadLittleMods marked this pull request as ready for review April 28, 2026 15:45
@MadLittleMods MadLittleMods requested review from a team as code owners April 28, 2026 15:45
@MadLittleMods MadLittleMods merged commit 9b87d55 into main Apr 28, 2026
3 of 4 checks passed
@MadLittleMods MadLittleMods deleted the madlittlemods/revert-865 branch April 28, 2026 15:46
@MadLittleMods
Copy link
Copy Markdown
Collaborator Author

MadLittleMods commented Apr 28, 2026

Merging to avoid downstream test failure pain ⏩

This was referenced Apr 30, 2026
Merged
Merged
MadLittleMods added a commit that referenced this pull request May 13, 2026
@MadLittleMods
Fix state not showing up fast enough with TestDelayedEvents (de-fla…
db8fc0f 
…ke v2) (#869)

Re-introducing the changes from #865 which were reverted in #867

Follow-up to #830

As experienced when running this test against the worker-based Synapse setup we use alongside the Synapse Pro Rust apps, https://github.com/element-hq/synapse-rust-apps/actions/runs/24910122124/job/72949760158?pr=360 (element-hq/synapse-rust-apps#360)

```
❌ TestDelayedEvents/delayed_state_events_are_kept_on_server_restart (10.12s)
      delayed_event_test.go:425: StopServer hs1
      delayed_event_test.go:429: StartServer hs1
      delayed_event_test.go:443: CSAPI.MustDo GET http://127.0.0.1:32978/_matrix/client/v3/rooms/%21MbDncghrqxTzEmQhCP:hs1/state/com.example.test/1 returned non-2xx code: 404 Not Found - body: {"errcode":"M_NOT_FOUND","error":"Event not found."}
```

Also updating the rest of the `TestDelayedEvents` tests to better account for state changes that might not show up immediately because processing/worker/replication delay


### Why does this flake happen?

Discussed in #865 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@MadLittleMods