Skip to content
New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite Datastore.get_server_verify_keys #5030

Merged
merged 5 commits into from Apr 9, 2019

Conversation

2 participants
@richvdh
Copy link
Member

commented Apr 8, 2019

Rewrite this so that it doesn't hammer the database.

Remove redundant merged_keys dict
There's no point in collecting a merged dict of keys: it is sufficient to
consider just the new keys which have been fetched by the most recent
key_fetch_fns.

@richvdh richvdh force-pushed the rav/rewrite_g_s_v_k branch from f22c8d7 to 739fb5c Apr 8, 2019

@richvdh richvdh requested a review from matrix-org/synapse-core Apr 8, 2019

@richvdh richvdh added this to In progress in Homeserver Task Board via automation Apr 8, 2019

@codecov

This comment has been minimized.

Copy link

commented Apr 8, 2019

Codecov Report

Merging #5030 into develop will decrease coverage by 0.01%.
The diff coverage is 96.66%.

@@             Coverage Diff             @@
##           develop    #5030      +/-   ##
===========================================
- Coverage    61.59%   61.58%   -0.02%     
===========================================
  Files          332      332              
  Lines        34215    34216       +1     
  Branches      5643     5643              
===========================================
- Hits         21076    21073       -3     
- Misses       11625    11629       +4     
  Partials      1514     1514

richvdh added some commits Apr 8, 2019

Replace SlavedKeyStore with a shim
since we're pulling everything out of KeyStore anyway, we may as well simplify
it.
Rewrite Datastore.get_server_verify_keys
Rewrite this so that it doesn't hammer the database.

@richvdh richvdh force-pushed the rav/rewrite_g_s_v_k branch from 1d6f9e5 to 1f1e8dd Apr 8, 2019

@richvdh richvdh merged commit 644b866 into develop Apr 9, 2019

24 checks passed

buildkite/synapse Build #897 passed (14 minutes, 18 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 15 seconds)
Details
buildkite/synapse/isort Passed (17 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (25 seconds)
Details
buildkite/synapse/packaging Passed (17 seconds)
Details
buildkite/synapse/pep-8 Passed (54 seconds)
Details
buildkite/synapse/pipeline Passed (2 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-4 Passed (12 minutes, 3 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-5 Passed (11 minutes, 39 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite Passed (6 minutes, 51 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite-slash-old-deps Passed (8 minutes, 16 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-4 Passed (13 minutes, 12 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (12 minutes, 30 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (7 minutes, 38 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (8 minutes, 29 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (12 minutes, 34 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (12 minutes, 33 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (7 minutes, 42 seconds)
Details
ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
codecov/patch 96.66% of diff hit (target 0%)
Details
codecov/project 61.58% (target 0%)
Details

Homeserver Task Board automation moved this from In progress to Done Apr 9, 2019

@richvdh richvdh deleted the rav/rewrite_g_s_v_k branch Apr 9, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.