/synapse

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Fix assertion to stop transaction queue getting wedged #2010

Merged
merged 1 commit into from Mar 15, 2017

Conversation

Reviewers
No reviews
Assignees

@erikjohnston erikjohnston

Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@richvdh @erikjohnston
@richvdh
Member

richvdh commented Mar 15, 2017

... and update some docstrings to correctly reflect the types being used.

I've done this as discussed, but having updated things to accurately reflect what's going on, am now having second thoughts and am wondering if it wouldn't have been better to cast the query result to int - that seems to be what happens elsewhere in the codebase. WDYT?
@richvdh
Fix assertion to stop transaction queue getting wedged 
... and update some docstrings to correctly reflect the types being used.

get_new_device_msgs_for_remote can return a long under some circumstances,
which was being stored in last_device_list_stream_id_by_dest, and was then
upsetting things on the next loop.

All checks have passed

8 successful checks
@matrixbot
SynapseSytestDendronHaproxyPR — Build #1070 detached succeeded in 14 min
Details
@matrixbot
Sytest Dendron (Commit) — Build #1689 origin/rav/fix_txnq_wedge succeeded in 12 min
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #2505 origin/rav/fix_txnq_wedge succeeded in 7 min 46 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2571 origin/rav/fix_txnq_wedge succeeded in 4 min 23 sec
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
29ed09e

@richvdh richvdh assigned erikjohnston Mar 15, 2017

@richvdh
Member

richvdh commented Mar 15, 2017

fixes #2003

@ara4n ara4n referenced this pull request Mar 15, 2017

Closed

Regarding allowing guest users to access the TURN server login info #1968

@erikjohnston
Owner

erikjohnston commented Mar 15, 2017

LGTM.

The casting is mostly to get from strings. We could/should probably change the int casts to longs, but whatevs
@richvdh
Member

richvdh commented Mar 15, 2017

synapse/synapse/storage/util/id_generators.py

Line 51 in 29ed09e

current_id = int(val) if val else step
isn't to get an int from a string. It seems to be to get an int from a long.

But, as you say, whatevs.

@richvdh richvdh merged commit 5f14e7e into develop Mar 15, 2017
8 checks passed

8 checks passed

SynapseSytestDendronHaproxyPR Build #1070 detached succeeded in 14 min
Details
Sytest Dendron (Commit) Build #1689 origin/rav/fix_txnq_wedge succeeded in 12 min
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #2505 origin/rav/fix_txnq_wedge succeeded in 7 min 46 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #2571 origin/rav/fix_txnq_wedge succeeded in 4 min 23 sec
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@richvdh richvdh deleted the rav/fix_txnq_wedge branch Mar 15, 2017

@richvdh richvdh referenced this pull request Mar 15, 2017

Closed

federation transaction queue gets wedged on a large queue of to-device messages #2003

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment