Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Move getEvent cache to externalCache #9379

Closed
wants to merge 47 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
264e9a6
Add delete key to ExternalCache
Half-Shot Feb 10, 2021
0b11773
Use external cache for events
Half-Shot Feb 10, 2021
963e1c6
changelog+linting
Half-Shot Feb 10, 2021
fc38c18
await
Half-Shot Feb 10, 2021
5358283
Use both internal and external caches
Half-Shot Feb 11, 2021
c673e3e
Call external_cache.delete syncronously
Half-Shot Feb 11, 2021
9ac17af
linting
Half-Shot Feb 11, 2021
e9fbbf1
fix port db
Half-Shot Feb 12, 2021
873da38
Update synapse/storage/databases/main/events_worker.py
Half-Shot Feb 11, 2021
2de6060
Do not auto expire events
Half-Shot Feb 16, 2021
c2f5415
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Feb 22, 2021
8b36dee
Add delete and expire methods to external_cache
Half-Shot Feb 22, 2021
f55d926
Squash changes to events_worker to fix commit issues
Half-Shot Feb 22, 2021
2be3a02
Use ms for expiry time on get()
Half-Shot Feb 22, 2021
48b35d9
Make external_event_cache_expiry_ms configurable
Half-Shot Feb 22, 2021
1e11898
linting
Half-Shot Feb 22, 2021
2585f57
fix config getter
Half-Shot Feb 22, 2021
52d3e5c
Add Del/Expire commands to test
Half-Shot Feb 22, 2021
0831f16
this is a property
Half-Shot Feb 23, 2021
4a32600
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Feb 25, 2021
316db51
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Mar 4, 2021
45b1c58
Merge tag 'v1.30.0rc1' into hs/hacked-together-event-cache
Half-Shot Mar 16, 2021
16f2376
Merge tag 'v1.30.0' into hs/hacked-together-event-cache
Half-Shot Mar 22, 2021
9009d29
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Mar 22, 2021
5f63151
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Apr 9, 2021
4be9d09
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Apr 13, 2021
82fcd3c
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Apr 19, 2021
f98d098
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Apr 20, 2021
d77072f
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Apr 21, 2021
5e8c7b4
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Apr 21, 2021
1315b6a
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Apr 22, 2021
89ad2f6
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot May 5, 2021
76288b9
Fix merge header
Half-Shot May 5, 2021
1f3e399
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot May 5, 2021
a5e4002
Attempt to pin to fix
Half-Shot May 6, 2021
6a20b4f
fix version
Half-Shot May 6, 2021
dacc395
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot May 11, 2021
7d33ba7
Merge remote-tracking branch 'origin/release-v1.36' into hs/hacked-to…
Half-Shot Jun 16, 2021
8bfb649
Merge tag 'v1.37.0rc1' into hs/hacked-together-event-cache
Half-Shot Jun 28, 2021
81dd28c
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Jun 29, 2021
f197953
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Jul 20, 2021
f6be804
Fix merge fail
Half-Shot Jul 20, 2021
6497040
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Jul 27, 2021
fad9189
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Aug 1, 2021
61293c8
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Aug 3, 2021
fb71966
Merge remote-tracking branch 'origin/develop' into hs/hacked-together…
Half-Shot Aug 10, 2021
1eb989f
await
Half-Shot Aug 10, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
await
  • Loading branch information
Half-Shot committed Aug 10, 2021
commit 1eb989fa7a93ace528a56ff90dbd401c9b888209
2 changes: 1 addition & 1 deletion synapse/storage/databases/main/events_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ async def _get_events_from_cache_or_db(
Returns:
map from event id to result
"""
event_entry_map = self._get_events_from_cache(
event_entry_map = await self._get_events_from_cache(
event_ids,
)

Expand Down