/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

Add count of one time keys to sync stream #2237

Merged
merged 5 commits into from May 23, 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 May 19, 2017

This adds the following to a sync result:

{
    "device_one_time_keys_count": {
        "signed_curve25519": 50
    },
    ...
}
@erikjohnston
Add count of one time keys to sync stream

Some checks were not successful

1 errored and 7 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #2185 origin/erikj/sync_key_count failed in 5 min 45 sec
Details
@matrixbot
SynapseSytestPostgresPR — Build #1892 detached succeeded in 6 min 11 sec
Details
@matrixbot
Sytest Postgres (Commit) — Build #3019 origin/erikj/sync_key_count succeeded in 5 min 6 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #3089 origin/erikj/sync_key_count succeeded in 5 min 15 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
b4f59c7

@erikjohnston erikjohnston assigned richvdh May 19, 2017

@richvdh

richvdh reviewed May 22, 2017
View changes

looks ok, but count_e2e_one_time_keys has a cache, and I'm unconvinced it will be correctly invalidated in the synchotrons when a key is claimed in the main process.

@richvdh richvdh assigned erikjohnston and unassigned richvdh May 22, 2017

@erikjohnston
Stream count_e2e_one_time_keys cache invalidation

Some checks were not successful

1 errored, 1 failing, and 6 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #2191 origin/erikj/sync_key_count failed in 6 min 39 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #3026 origin/erikj/sync_key_count succeeded in 6 min 28 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #3095 origin/erikj/sync_key_count succeeded in 5 min 12 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
74bf4ee
@erikjohnston
Owner

erikjohnston commented May 22, 2017

looks ok, but count_e2e_one_time_keys has a cache, and I'm unconvinced it will be correctly invalidated in the synchotrons when a key is claimed in the main process.

Oops, yeah. It now streams the invalidations to workers.

@erikjohnston erikjohnston assigned richvdh and unassigned erikjohnston May 22, 2017

@erikjohnston
Add missing storage function to slave store

Some checks were not successful

1 errored and 7 successful checks
@matrixbot
Sytest SQLite (Commit) — Build #3097 origin/erikj/sync_key_count failed in 17 sec
Details
@matrixbot
Sytest Dendron (Commit) — Build #2193 origin/erikj/sync_key_count succeeded in 9 min 34 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #3028 origin/erikj/sync_key_count succeeded in 6 min 16 sec
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
f85a415
@erikjohnston
Owner

erikjohnston commented May 22, 2017

(The sqlite failure is spurious as it built on a box that didn't have tox installed)
@richvdh

richvdh reviewed May 22, 2017
View changes

you missed one of the calls:

synapse/synapse/storage/end_to_end_keys.py

Line 241 in f85a415

self.count_e2e_one_time_keys.invalidate, (user_id, device_id,)

LGTM otherwise

@richvdh richvdh assigned erikjohnston and unassigned richvdh May 22, 2017

@erikjohnston
Owner

erikjohnston commented May 23, 2017

But i used grep and everything! :(
@erikjohnston
Missed an invalidation

Some checks were not successful

1 errored, 1 failing, and 6 successful checks
@matrixbot
Sytest SQLite (Commit) — Build #3103 origin/erikj/sync_key_count failed in 3.9 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Commit) — Build #2199 origin/erikj/sync_key_count succeeded in 9 min 50 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #3034 origin/erikj/sync_key_count succeeded in 8 min 18 sec
Details
@matrixbot
Sytest Postgres (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
e6618ec
synapse/storage/end_to_end_keys.py
@@ -240,6 +240,9 @@ def _claim_e2e_one_time_keys(txn):
txn.call_after(
self.count_e2e_one_time_keys.invalidate, (user_id, device_id,)
@richvdh

richvdh May 23, 2017

Member

now redundant?

@richvdh
Member

richvdh commented May 23, 2017

But i used grep and everything! :(

Apparently you fail at grep.

@richvdh richvdh closed this May 23, 2017

@richvdh richvdh reopened this May 23, 2017

@erikjohnston
Remove redundant invalidation

Some checks were not successful

1 errored, 1 failing, and 6 successful checks
@matrixbot
Sytest SQLite (Commit) — Build #3104 origin/erikj/sync_key_count failed in 3.5 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Commit) — Build #2200 origin/erikj/sync_key_count succeeded in 8 min 58 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #3035 origin/erikj/sync_key_count succeeded in 8 min 8 sec
Details
@matrixbot
Sytest Postgres (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
8cf9f0a
@erikjohnston
Owner

erikjohnston commented May 23, 2017

Apparently you fail at grep.

And editing code too. Sigh. applies more coffee
@richvdh

richvdh approved these changes May 23, 2017
View changes

lgtm

@erikjohnston erikjohnston merged commit fbbc40f into develop May 23, 2017
6 of 8 checks passed

6 of 8 checks passed

Sytest SQLite (Commit) Build #3104 origin/erikj/sync_key_count failed in 3.5 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
Sytest Dendron (Commit) Build #2200 origin/erikj/sync_key_count succeeded in 8 min 58 sec
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #3035 origin/erikj/sync_key_count succeeded in 8 min 8 sec
Details
Sytest Postgres (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

This was referenced Jun 1, 2017

Closed
Merged

richvdh added a commit to matrix-org/matrix-js-sdk that referenced this pull request Jul 19, 2017

@krombel @richvdh
use device_one_time_keys_count transmitted by /sync (#493) 
Where it is available, use the one_time_keys_count returned by /sync instead of polling the server for it.

This was added to synapse in matrix-org/synapse#2237.

Some checks were not successful

1 failing and 1 successful checks
continuous-integration/travis-ci/push — The Travis CI build failed
Details
@matrixbot
JavascriptSDK — Build #1688 origin/develop succeeded in 7 min 24 sec
Details
e686eb7

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

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