John Sully
e245fdbb89
Merge commit '97e58ee026675e70fbd8843f7a86e98f53a3c791' into unstable
...
Former-commit-id: 8ab77465dbb3c0b1f859f24cdbb461937516eb6a
2020-05-21 19:37:42 -04:00
John Sully
ad1eac9856
Merge commit 'bec68bff2978de88b23140f41b6a943162333b11' into unstable
...
Former-commit-id: 8ab77465dbb3c0b1f859f24cdbb461937516eb6a
2020-05-21 19:37:42 -04:00
John Sully
cc8d7c1afd
Merge commit '3b373fbb0b05ee862dfef32199cfb63459019cd9' into unstable
...
Former-commit-id: 201bf73ef772914c56ac680bb9c7fb6a98b218b2
2020-05-21 18:57:28 -04:00
John Sully
48058188a8
Merge commit '414debfd04d21c0b19d5f6bb5249398d83670f3d' into unstable
...
Former-commit-id: 201bf73ef772914c56ac680bb9c7fb6a98b218b2
2020-05-21 18:57:28 -04:00
John Sully
ccedb2fa73
Merge commit 'd7b07d3ded06b4cd843baffd3a6d33dd96efd401' into unstable
...
Former-commit-id: 49784c8122e827bd9de86bbae4d88c313400e86e
2020-05-21 18:48:49 -04:00
John Sully
3384af024d
Merge commit 'cbcd07777dc569618a34f59e5fd0de53178f4f1d' into unstable
...
Former-commit-id: 49784c8122e827bd9de86bbae4d88c313400e86e
2020-05-21 18:48:49 -04:00
Madelyn Olson
5d6f9cd3b1
EAGAIN for tls during diskless load
2020-05-21 15:20:59 -07:00
Madelyn Olson
5109f16b77
EAGAIN for tls during diskless load
2020-05-21 15:20:59 -07:00
Salvatore Sanfilippo
a7d4f5f144
Merge pull request #7304 from hwware/lcs_fix
...
fix server crash for STRALGO command
2020-05-22 00:18:27 +02:00
Salvatore Sanfilippo
90fda5c97c
Merge pull request #7304 from hwware/lcs_fix
...
fix server crash for STRALGO command
2020-05-22 00:18:27 +02:00
hwware
7c87d86aef
using moreargs variable
2020-05-21 18:13:35 -04:00
hwware
06a59fd44d
using moreargs variable
2020-05-21 18:13:35 -04:00
John Sully
8377df8330
Merge commit '87924d673138531cbaf606015ea7b6a9e3ae2465' into unstable
...
Former-commit-id: 3e03f308b564cd94f4a6407c80792d080e0f83c5
2020-05-21 17:55:09 -04:00
John Sully
3324d4dc0f
Merge commit '5719b3054a534e62c25ae97680ecd4f7238ba484' into unstable
...
Former-commit-id: 3e03f308b564cd94f4a6407c80792d080e0f83c5
2020-05-21 17:55:09 -04:00
John Sully
327d543f2c
Merge commit 'c5d805f87771581d3f6b29861ed2062c0ae2a688' into unstable
...
Former-commit-id: 95cecb0229af0278cf614ffd746ba829ae7c897c
2020-05-21 17:45:15 -04:00
John Sully
b6500a08dc
Merge commit '026cc11b056f063631d990f1a9db45b4e583974e' into unstable
...
Former-commit-id: 95cecb0229af0278cf614ffd746ba829ae7c897c
2020-05-21 17:45:15 -04:00
John Sully
4246199553
Merge commit '7cb94fd6cc9e1ad106964171023457ae3ff0a40b' into unstable
...
Former-commit-id: 7676f5b15f24a044257250b8891d23b14642da48
2020-05-21 17:36:53 -04:00
John Sully
c4db71f971
Merge commit '024c380b9da02bc4112822c0f5f9ac1388b4205b' into unstable
...
Former-commit-id: 7676f5b15f24a044257250b8891d23b14642da48
2020-05-21 17:36:53 -04:00
John Sully
b47d7715a4
Merge commit '71134e357ffd6ced7c40c145205dbbac173ee181' into unstable
...
Former-commit-id: d5b057534a3dbf50f94465332107da2490811946
2020-05-21 17:32:53 -04:00
John Sully
24322b9b6d
Merge commit 'eba28e2cea0b2632cf751426ada02adf24f273db' into unstable
...
Former-commit-id: d5b057534a3dbf50f94465332107da2490811946
2020-05-21 17:32:53 -04:00
John Sully
5935707790
Merge commit '2535a172c1247d5d32d6f2fefe51b95c27ba8ae1' into unstable
...
Former-commit-id: 7a15f6dfc7331d6759201137971e7c2965672be8
2020-05-21 17:30:56 -04:00
John Sully
ba7483c20b
Merge commit 'c35a53169ffdbdf73f91224b6e62f6129fb9a838' into unstable
...
Former-commit-id: 7a15f6dfc7331d6759201137971e7c2965672be8
2020-05-21 17:30:56 -04:00
hwware
c4776244f8
fix server crash for STRALGO command
2020-05-21 17:30:36 -04:00
hwware
5edb1beb63
fix server crash for STRALGO command
2020-05-21 17:30:36 -04:00
Salvatore Sanfilippo
5c4a67882a
Merge pull request #7300 from ShooterIT/comment
...
Replace 'addDeferredMultiBulkLength' with 'addReplyDeferredLen' in comment
2020-05-21 15:53:01 +02:00
Salvatore Sanfilippo
fe640e5858
Merge pull request #7300 from ShooterIT/comment
...
Replace 'addDeferredMultiBulkLength' with 'addReplyDeferredLen' in comment
2020-05-21 15:53:01 +02:00
Salvatore Sanfilippo
5746b71485
Merge pull request #7288 from yossigo/tls-protocols-redis-conf-example
...
TLS: Improve tls-protocols clarity in redis.conf.
2020-05-21 15:49:37 +02:00
Salvatore Sanfilippo
e387f5ba62
Merge pull request #7288 from yossigo/tls-protocols-redis-conf-example
...
TLS: Improve tls-protocols clarity in redis.conf.
2020-05-21 15:49:37 +02:00
Salvatore Sanfilippo
a1bda4a393
Merge pull request #7299 from ShooterIT/reply-bytes
...
Fix reply bytes calculation error on 32bit platform
2020-05-21 15:47:15 +02:00
Salvatore Sanfilippo
9f932bcc82
Merge pull request #7299 from ShooterIT/reply-bytes
...
Fix reply bytes calculation error on 32bit platform
2020-05-21 15:47:15 +02:00
ShooterIT
fbe0c03030
Replace addDeferredMultiBulkLength with addReplyDeferredLen in comment
2020-05-21 21:45:35 +08:00
ShooterIT
86f0e873c7
Replace addDeferredMultiBulkLength with addReplyDeferredLen in comment
2020-05-21 21:45:35 +08:00
ShooterIT
9c0aa1a95b
Fix reply bytes calculation error
...
Fix #7275 .
2020-05-21 21:00:30 +08:00
ShooterIT
9018ddc32a
Fix reply bytes calculation error
...
Fix #7275 .
2020-05-21 21:00:30 +08:00
Salvatore Sanfilippo
f38d0ec966
Merge pull request #7296 from soloestoy/tracking-broken-redir
...
Tracking: flag CLIENT_TRACKING_BROKEN_REDIR when redir broken
2020-05-21 09:26:12 +02:00
Salvatore Sanfilippo
1afb002d69
Merge pull request #7296 from soloestoy/tracking-broken-redir
...
Tracking: flag CLIENT_TRACKING_BROKEN_REDIR when redir broken
2020-05-21 09:26:12 +02:00
zhaozhao.zz
4a93049285
Tracking: flag CLIENT_TRACKING_BROKEN_REDIR when redir broken
2020-05-21 13:57:29 +08:00
zhaozhao.zz
4f3ff46a81
Tracking: flag CLIENT_TRACKING_BROKEN_REDIR when redir broken
2020-05-21 13:57:29 +08:00
John Sully
903aeda836
Override missing new, fix new/delete mismatch
...
Former-commit-id: 712d825c233c3ebbc49b22b8c1865916ca9dc3bc
2020-05-20 15:57:08 -04:00
John Sully
50fb85a489
Override missing new, fix new/delete mismatch
...
Former-commit-id: 712d825c233c3ebbc49b22b8c1865916ca9dc3bc
2020-05-20 15:57:08 -04:00
Salvatore Sanfilippo
f0d8484f82
Merge pull request #7289 from oranagra/defrag_edge_case
...
fix a rare active defrag edge case bug leading to stagnation
2020-05-20 15:17:02 +02:00
Salvatore Sanfilippo
af34245692
Merge pull request #7289 from oranagra/defrag_edge_case
...
fix a rare active defrag edge case bug leading to stagnation
2020-05-20 15:17:02 +02:00
Oran Agra
86b1b2e138
fix a rare active defrag edge case bug leading to stagnation
...
There's a rare case which leads to stagnation in the defragger, causing
it to keep scanning the keyspace and do nothing (not moving any
allocation), this happens when all the allocator slabs of a certain bin
have the same % utilization, but the slab from which new allocations are
made have a lower utilization.
this commit fixes it by removing the current slab from the overall
average utilization of the bin, and also eliminate any precision loss in
the utilization calculation and move the decision about the defrag to
reside inside jemalloc.
and also add a test that consistently reproduce this issue.
2020-05-20 16:04:42 +03:00
Oran Agra
88d71f4793
fix a rare active defrag edge case bug leading to stagnation
...
There's a rare case which leads to stagnation in the defragger, causing
it to keep scanning the keyspace and do nothing (not moving any
allocation), this happens when all the allocator slabs of a certain bin
have the same % utilization, but the slab from which new allocations are
made have a lower utilization.
this commit fixes it by removing the current slab from the overall
average utilization of the bin, and also eliminate any precision loss in
the utilization calculation and move the decision about the defrag to
reside inside jemalloc.
and also add a test that consistently reproduce this issue.
2020-05-20 16:04:42 +03:00
Yossi Gottlieb
5c82140f66
TLS: Improve tls-protocols clarity in redis.conf.
2020-05-20 15:14:23 +03:00
Yossi Gottlieb
39d1e39212
TLS: Improve tls-protocols clarity in redis.conf.
2020-05-20 15:14:23 +03:00
Oran Agra
444af0145e
improve DEBUG MALLCTL to be able to write to write only fields.
...
also support:
debug mallctl-str thread.tcache.flush VOID
2020-05-20 14:09:22 +03:00
Oran Agra
5d83e9e1de
improve DEBUG MALLCTL to be able to write to write only fields.
...
also support:
debug mallctl-str thread.tcache.flush VOID
2020-05-20 14:09:22 +03:00
Salvatore Sanfilippo
a5268a21bc
Merge pull request #7276 from hujiecs/fix-clear-all-command-flag-in-acl
...
fix clear USER_FLAG_ALLCOMMANDS flag in acl
2020-05-19 16:19:28 +02:00
Salvatore Sanfilippo
23a85ba191
Merge pull request #7276 from hujiecs/fix-clear-all-command-flag-in-acl
...
fix clear USER_FLAG_ALLCOMMANDS flag in acl
2020-05-19 16:19:28 +02:00