/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

Don't user upsert to persist new one time keys #2053

Merged
merged 6 commits into from Mar 29, 2017

Conversation

Reviewers

@richvdh richvdh

Assignees

@erikjohnston erikjohnston

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

erikjohnston commented Mar 23, 2017

Instead we no-op duplicate one time key uploads, an error if the key_id
already exists but encodes a different key.
@erikjohnston
Don't user upsert to persist new one time keys 
Instead we no-op duplicate one time key uploads, an error if the key_id
already exists but encodes a different key.

Some checks were not successful

1 failing and 7 successful checks
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Commit) — Build #1786 origin/erikj/e2e_one_time_upsert succeeded in 11 min
Details
@matrixbot
Sytest Postgres (Commit) — Build #2607 origin/erikj/e2e_one_time_upsert succeeded in 7 min 37 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2680 origin/erikj/e2e_one_time_upsert succeeded in 4 min 20 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
e64655c

@erikjohnston erikjohnston assigned richvdh Mar 23, 2017

@erikjohnston
Owner

erikjohnston commented Mar 23, 2017

Oh, I suppose I should raise a more helpful exception
@erikjohnston
Raise a more helpful exception

Some checks were not successful

2 failing and 6 successful checks
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Commit) — Build #1800 origin/erikj/e2e_one_time_upsert succeeded in 15 min
Details
@matrixbot
Sytest Postgres (Commit) — Build #2621 origin/erikj/e2e_one_time_upsert succeeded in 8 min 54 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2694 origin/erikj/e2e_one_time_upsert succeeded in 6 min 37 sec
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
6ebe2d2
@erikjohnston
Owner

erikjohnston commented Mar 24, 2017

(I'm now raising a slightly more helpful exception)
@richvdh

richvdh requested changes Mar 24, 2017
View changes

can we change it to include the algorithm in the table key?

synapse/storage/end_to_end_keys.py
+ # First we check if we have already persisted any of the keys.
+ rows = yield self._simple_select_many_batch(
+ table="e2e_one_time_keys_json",
+ column="key_id",
@richvdh

richvdh Mar 24, 2017

Member

technically the algorithm is part of the key - so it's valid to have an "ed25519:aaaaa" as well as a "rot13:aaaaa". I rather hope the index reflects that, but haven't checked...

@erikjohnston

erikjohnston Mar 28, 2017

Owner

Oh bleurgh, thanks, have changed.

synapse/storage/end_to_end_keys.py
+ # We are protected from race between lookup and insertion due to
+ # a unique constraint. If there is a race of two calls to
+ # `add_e2e_one_time_keys` then they'll conflict and we will only
+ # insert one set.
@richvdh

richvdh Mar 24, 2017

Member

... and throw a 500 or something, presumably? I suppose that's fine because the client should retry on the 500 and hit the api again, at which point the lookup should conclude that it's all fine.

@erikjohnston

erikjohnston Mar 28, 2017

Owner

Yup.

@richvdh richvdh assigned erikjohnston and unassigned richvdh Mar 24, 2017

@erikjohnston
The algorithm is part of the key id

Some checks were not successful

3 errored, 3 failing, and 2 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1834 origin/erikj/e2e_one_time_upsert failed in 15 min
Details
@matrixbot
Sytest Postgres (Commit) — Build #2655 origin/erikj/e2e_one_time_upsert failed in 8 min 22 sec
Details
@matrixbot
Sytest SQLite (Commit) — Build #2730 origin/erikj/e2e_one_time_upsert failed in 7 min 2 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
58a3536

@erikjohnston erikjohnston assigned richvdh and unassigned erikjohnston Mar 28, 2017

@richvdh

richvdh approved these changes Mar 29, 2017
View changes

lgtm

@richvdh
Member

richvdh commented Mar 29, 2017

modulo test failures. what's all that about?

@richvdh richvdh assigned erikjohnston and unassigned richvdh Mar 29, 2017

erikjohnston added some commits Mar 29, 2017

@erikjohnston
Correctly look up key
ac6bc55
@erikjohnston
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2… 
…e_one_time_upsert

Some checks were not successful

3 failing and 2 successful checks
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
4ad613f
@erikjohnston
Owner

erikjohnston commented Mar 29, 2017

Whoops, look like I was a crank. Hopefully fixed now.
@erikjohnston
Decrank last commit

All checks have passed

8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1841 origin/erikj/e2e_one_time_upsert succeeded in 13 min
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #2662 origin/erikj/e2e_one_time_upsert succeeded in 8 min 12 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2736 origin/erikj/e2e_one_time_upsert succeeded in 7 min 21 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
e4df0e1

@erikjohnston erikjohnston merged commit 2f8b580 into develop Mar 29, 2017
8 checks passed

8 checks passed

Sytest Dendron (Commit) Build #1841 origin/erikj/e2e_one_time_upsert succeeded in 13 min
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #2662 origin/erikj/e2e_one_time_upsert succeeded in 8 min 12 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #2736 origin/erikj/e2e_one_time_upsert succeeded in 7 min 21 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@erikjohnston erikjohnston deleted the erikj/e2e_one_time_upsert branch Oct 26, 2017

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