Skip to content

Commit 4ffe5e7

Browse files
shcherbakshcherbak
committed
revert caches overoptimization
1 parent 8978375 commit 4ffe5e7

7 files changed

Lines changed: 109 additions & 116 deletions

‎charts/synapse/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: v2
22
appVersion: 1.151.0
33
description: matrix synapse kubernetes deployment
44
name: synapse
5-
version: 2.4.15
5+
version: 2.4.16

‎charts/synapse/templates/synapse-secret.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ stringData:
349349
caches:
350350
expire_caches: true
351351
global_factor: {{ $.Values.synapse.caches.globalFactor }}
352-
{{- if and $.Values.synapse.caches.perCacheFactors (eq $worker "sync") }}
352+
{{- if $.Values.synapse.caches.perCacheFactors }}
353353
per_cache_factors:
354354
{{- range $key, $val := $.Values.synapse.caches.perCacheFactors }}
355355
{{ $key }}: {{ printf "%.1f" ($val | float64) }}

‎charts/synapse/tests/golden/fixtures/test-synapse-secret-no-pgbouncer-stream-writers.golden.yaml‎

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ stringData:
231231
caches:
232232
expire_caches: true
233233
global_factor: 1
234-
cache_entry_ttl: 30m
235-
sync_response_cache_duration: 2m
234+
cache_entry_ttl: 10m
235+
sync_response_cache_duration: 1m
236236
cache_autotuning:
237237
max_cache_memory_usage: 1843M
238238
target_cache_memory_usage: 1474M
@@ -488,8 +488,8 @@ stringData:
488488
caches:
489489
expire_caches: true
490490
global_factor: 1
491-
cache_entry_ttl: 30m
492-
sync_response_cache_duration: 2m
491+
cache_entry_ttl: 10m
492+
sync_response_cache_duration: 1m
493493
cache_autotuning:
494494
max_cache_memory_usage: 1843M
495495
target_cache_memory_usage: 1474M
@@ -753,8 +753,8 @@ stringData:
753753
caches:
754754
expire_caches: true
755755
global_factor: 1
756-
cache_entry_ttl: 30m
757-
sync_response_cache_duration: 2m
756+
cache_entry_ttl: 10m
757+
sync_response_cache_duration: 1m
758758
cache_autotuning:
759759
max_cache_memory_usage: 1843M
760760
target_cache_memory_usage: 1474M
@@ -1025,8 +1025,8 @@ stringData:
10251025
caches:
10261026
expire_caches: true
10271027
global_factor: 1
1028-
cache_entry_ttl: 30m
1029-
sync_response_cache_duration: 2m
1028+
cache_entry_ttl: 10m
1029+
sync_response_cache_duration: 1m
10301030
cache_autotuning:
10311031
max_cache_memory_usage: 1843M
10321032
target_cache_memory_usage: 1474M
@@ -1297,8 +1297,8 @@ stringData:
12971297
caches:
12981298
expire_caches: true
12991299
global_factor: 1
1300-
cache_entry_ttl: 30m
1301-
sync_response_cache_duration: 2m
1300+
cache_entry_ttl: 10m
1301+
sync_response_cache_duration: 1m
13021302
cache_autotuning:
13031303
max_cache_memory_usage: 1843M
13041304
target_cache_memory_usage: 1474M
@@ -1562,8 +1562,8 @@ stringData:
15621562
caches:
15631563
expire_caches: true
15641564
global_factor: 1
1565-
cache_entry_ttl: 30m
1566-
sync_response_cache_duration: 2m
1565+
cache_entry_ttl: 10m
1566+
sync_response_cache_duration: 1m
15671567
cache_autotuning:
15681568
max_cache_memory_usage: 1843M
15691569
target_cache_memory_usage: 1474M
@@ -1834,8 +1834,8 @@ stringData:
18341834
caches:
18351835
expire_caches: true
18361836
global_factor: 1
1837-
cache_entry_ttl: 30m
1838-
sync_response_cache_duration: 2m
1837+
cache_entry_ttl: 10m
1838+
sync_response_cache_duration: 1m
18391839
cache_autotuning:
18401840
max_cache_memory_usage: 1843M
18411841
target_cache_memory_usage: 1474M
@@ -2105,8 +2105,8 @@ stringData:
21052105
caches:
21062106
expire_caches: true
21072107
global_factor: 1
2108-
cache_entry_ttl: 30m
2109-
sync_response_cache_duration: 2m
2108+
cache_entry_ttl: 10m
2109+
sync_response_cache_duration: 1m
21102110
cache_autotuning:
21112111
max_cache_memory_usage: 1843M
21122112
target_cache_memory_usage: 1474M
@@ -2372,8 +2372,8 @@ stringData:
23722372
caches:
23732373
expire_caches: true
23742374
global_factor: 1
2375-
cache_entry_ttl: 30m
2376-
sync_response_cache_duration: 2m
2375+
cache_entry_ttl: 10m
2376+
sync_response_cache_duration: 1m
23772377
cache_autotuning:
23782378
max_cache_memory_usage: 1843M
23792379
target_cache_memory_usage: 1474M
@@ -2639,8 +2639,8 @@ stringData:
26392639
caches:
26402640
expire_caches: true
26412641
global_factor: 1
2642-
cache_entry_ttl: 30m
2643-
sync_response_cache_duration: 2m
2642+
cache_entry_ttl: 10m
2643+
sync_response_cache_duration: 1m
26442644
cache_autotuning:
26452645
max_cache_memory_usage: 1843M
26462646
target_cache_memory_usage: 1474M
@@ -2911,8 +2911,8 @@ stringData:
29112911
caches:
29122912
expire_caches: true
29132913
global_factor: 1
2914-
cache_entry_ttl: 30m
2915-
sync_response_cache_duration: 2m
2914+
cache_entry_ttl: 10m
2915+
sync_response_cache_duration: 1m
29162916
cache_autotuning:
29172917
max_cache_memory_usage: 1843M
29182918
target_cache_memory_usage: 1474M
@@ -3183,8 +3183,8 @@ stringData:
31833183
caches:
31843184
expire_caches: true
31853185
global_factor: 1
3186-
cache_entry_ttl: 30m
3187-
sync_response_cache_duration: 2m
3186+
cache_entry_ttl: 10m
3187+
sync_response_cache_duration: 1m
31883188
cache_autotuning:
31893189
max_cache_memory_usage: 1843M
31903190
target_cache_memory_usage: 1474M
@@ -3440,8 +3440,8 @@ stringData:
34403440
caches:
34413441
expire_caches: true
34423442
global_factor: 1
3443-
cache_entry_ttl: 30m
3444-
sync_response_cache_duration: 2m
3443+
cache_entry_ttl: 10m
3444+
sync_response_cache_duration: 1m
34453445
cache_autotuning:
34463446
max_cache_memory_usage: 1843M
34473447
target_cache_memory_usage: 1474M
@@ -3712,8 +3712,8 @@ stringData:
37123712
caches:
37133713
expire_caches: true
37143714
global_factor: 1
3715-
cache_entry_ttl: 30m
3716-
sync_response_cache_duration: 2m
3715+
cache_entry_ttl: 10m
3716+
sync_response_cache_duration: 1m
37173717
cache_autotuning:
37183718
max_cache_memory_usage: 1843M
37193719
target_cache_memory_usage: 1474M
@@ -3977,8 +3977,8 @@ stringData:
39773977
caches:
39783978
expire_caches: true
39793979
global_factor: 1
3980-
cache_entry_ttl: 30m
3981-
sync_response_cache_duration: 2m
3980+
cache_entry_ttl: 10m
3981+
sync_response_cache_duration: 1m
39823982
cache_autotuning:
39833983
max_cache_memory_usage: 1843M
39843984
target_cache_memory_usage: 1474M
@@ -4242,12 +4242,8 @@ stringData:
42424242
caches:
42434243
expire_caches: true
42444244
global_factor: 1
4245-
per_cache_factors:
4246-
does_pair_of_users_share_a_room: 2.0
4247-
does_pair_of_users_share_a_room_joined_or_invited: 2.0
4248-
get_unread_event_push_actions_by_room_for_user: 4.0
4249-
cache_entry_ttl: 30m
4250-
sync_response_cache_duration: 2m
4245+
cache_entry_ttl: 10m
4246+
sync_response_cache_duration: 1m
42514247
cache_autotuning:
42524248
max_cache_memory_usage: 1843M
42534249
target_cache_memory_usage: 1474M
@@ -4518,8 +4514,8 @@ stringData:
45184514
caches:
45194515
expire_caches: true
45204516
global_factor: 1
4521-
cache_entry_ttl: 30m
4522-
sync_response_cache_duration: 2m
4517+
cache_entry_ttl: 10m
4518+
sync_response_cache_duration: 1m
45234519
cache_autotuning:
45244520
max_cache_memory_usage: 1843M
45254521
target_cache_memory_usage: 1474M
@@ -4790,8 +4786,8 @@ stringData:
47904786
caches:
47914787
expire_caches: true
47924788
global_factor: 1
4793-
cache_entry_ttl: 30m
4794-
sync_response_cache_duration: 2m
4789+
cache_entry_ttl: 10m
4790+
sync_response_cache_duration: 1m
47954791
cache_autotuning:
47964792
max_cache_memory_usage: 1843M
47974793
target_cache_memory_usage: 1474M
@@ -5062,8 +5058,8 @@ stringData:
50625058
caches:
50635059
expire_caches: true
50645060
global_factor: 1
5065-
cache_entry_ttl: 30m
5066-
sync_response_cache_duration: 2m
5061+
cache_entry_ttl: 10m
5062+
sync_response_cache_duration: 1m
50675063
cache_autotuning:
50685064
max_cache_memory_usage: 1843M
50695065
target_cache_memory_usage: 1474M
@@ -5327,8 +5323,8 @@ stringData:
53275323
caches:
53285324
expire_caches: true
53295325
global_factor: 1
5330-
cache_entry_ttl: 30m
5331-
sync_response_cache_duration: 2m
5326+
cache_entry_ttl: 10m
5327+
sync_response_cache_duration: 1m
53325328
cache_autotuning:
53335329
max_cache_memory_usage: 1843M
53345330
target_cache_memory_usage: 1474M

0 commit comments

Comments
 (0)