Skip to content

workaround for https://github.com/matrix-org/synapse/issues/6536#772

Merged
richvdh merged 1 commit intodevelopfrom
rav/6536_workaround/1
Dec 19, 2019
Merged

workaround for https://github.com/matrix-org/synapse/issues/6536#772
richvdh merged 1 commit intodevelopfrom
rav/6536_workaround/1

Conversation

@richvdh
Copy link
Member

@richvdh richvdh commented Dec 16, 2019

(matrix-org/synapse#6536)

I feel like there are going to be a lot of these

@richvdh richvdh requested a review from a team December 16, 2019 12:17
I feel like there are going to be a lot of these
@richvdh richvdh force-pushed the rav/6536_workaround/1 branch from 2d965b1 to b7f1479 Compare December 16, 2019 12:20
log_if_fail "Joined room $room_id";

# workaround for https://github.com/matrix-org/synapse/issues/6536
delay( 0.5 );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd really rather avoid adding delays if possible given how long it takes to run sytest anyway. Can we not wait for the join to come down a sync? I know that's not quite the same, but its a heuristic we use elsewhere for similar things

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well... we're waiting for latest_events_in_room to get flushed, not the events stream: and part of the problem is that latest_events_in_room is flushed after the events stream.

so yeah we could wait for a sync and it would probably work, but really we'd just be using it as a proxy for "wait a bit", which we may as well do with a delay.

Compromise: we could make it only delay in worker mode?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, doing that would help. It's fine for now I guess, I just don't want to end up in a situation where we delay in loads of tests, which I could see happening more and more as we continue to split things apart

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... the right solution might be to fix the bug?

@richvdh richvdh merged commit df29ca9 into develop Dec 19, 2019
@richvdh richvdh deleted the rav/6536_workaround/1 branch December 19, 2019 11:50
anoadragon453 added a commit that referenced this pull request Mar 20, 2020
…ase-v1.8.x

* origin/release-v1.8.0: (27 commits)
  Test for outliers whose auth events are in a different room
  Test for receiving events with auth events in the wrong room
  enable frozen dicts in synapse (#778)
  Fix c&p error in #779
  Add support for synapse multi DB setups. (#775)
  Add console feedbak for the TAP output mode (#779)
  workaround for matrix-org/synapse#6536 (#772)
  Test for backfilled events whose prev_events cross room boundaries (#769)
  Add dendrite's logs to buildkite's artifacts (#773)
  Make the replication torture level adjustable (#771)
  Add test for removing redactions from search results (#747)
  Sanity-checking of some params (#765)
  Fix some 'undefined value' warnings (#768)
  Remove redundant fallback in on_request_federation_v1_event (#766)
  Deflake an AS test (#764)
  Add tests for outbound v2 invite API
  Fix diagnostics from logout test (#763)
  Add comment to explain what the v1 outbound test relies on
  Re-fix test names
  Fix test names
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants