Madelyn Olson
cdcf5af5aa
Converge hash validation for adding and removing
2020-05-22 12:37:49 +02:00
Benjamin Sergeant
e8b09d2203
do not handle --cluster-yes for cluster fix mode
2020-05-22 12:37:49 +02:00
Benjamin Sergeant
57b4fb0d84
fix typo ...
2020-05-22 12:37:49 +02:00
Benjamin Sergeant
29f25e4111
Redis-cli 6.0.1 --cluster-yes
doesn't work ( fix #7246 )
...
This make it so that all prompts for all redis-cli --cluster commands are automatically answered with a yes.
2020-05-22 12:37:49 +02:00
Oran Agra
00d8b92b89
fix valgrind test failure in replication test
...
in b4416280c i added more keys to that test to make it run longer
but in valgrind this now means the test times out, give valgrind more
time.
2020-05-22 12:37:49 +02:00
Oran Agra
5e17e6276c
add regression test for the race in #7205
...
with the original version of 6.0.0, this test detects an excessive full
sync.
with the fix in 1a7cd2c0e, this test detects memory corruption,
especially when using libc allocator with or without valgrind.
2020-05-22 12:37:49 +02:00
antirez
96e7c011e2
Improve the PSYNC2 test reliability.
2020-05-22 12:37:49 +02:00
Salvatore Sanfilippo
285817b28a
Merge pull request #7305 from madolson/unstable-connection
...
EAGAIN not handled for TLS during diskless load
2020-05-22 12:25:40 +02:00
Salvatore Sanfilippo
ee93a70e7b
Merge pull request #7306 from QuChen88/chained-replica-offset
...
Disconnect chained replicas when the replica performs PSYNC with the master always to avoid replication offset mismatch between master and chained replicas
2020-05-22 12:23:07 +02:00
John Sully
8f8dea57db
Merge tag '6.0.1' into unstable
...
Redis 6.0.1.
Former-commit-id: c505df8830123904da026be2aacbd92a95a5e37c
2020-05-21 23:41:36 -04:00
John Sully
08a2facf13
Missing noexcept
...
Former-commit-id: f214ada545f810f8a9095753984b75c438cd6464
2020-05-21 23:25:50 -04:00
John Sully
8a14bb4b10
build failure on macos
...
Former-commit-id: c10aa3b8b0811da9931745695c5de06fdfa99fe3
2020-05-21 23:24:34 -04:00
John Sully
27eb239f1a
Fix bad merge in CI.yml
...
Former-commit-id: 6311d709c39b3bacaeab77b18033010f1b548f81
2020-05-21 22:09:06 -04:00
Qu Chen
42f5da5d2d
Disconnect chained replicas when the replica performs PSYNC with the master always to avoid replication offset mismatch between master and chained replicas.
2020-05-21 18:42:10 -07:00
John Sully
ad1eac9856
Merge commit 'bec68bff2978de88b23140f41b6a943162333b11' into unstable
...
Former-commit-id: 8ab77465dbb3c0b1f859f24cdbb461937516eb6a
2020-05-21 19:37:42 -04:00
John Sully
48058188a8
Merge commit '414debfd04d21c0b19d5f6bb5249398d83670f3d' into unstable
...
Former-commit-id: 201bf73ef772914c56ac680bb9c7fb6a98b218b2
2020-05-21 18:57:28 -04:00
John Sully
3384af024d
Merge commit 'cbcd07777dc569618a34f59e5fd0de53178f4f1d' into unstable
...
Former-commit-id: 49784c8122e827bd9de86bbae4d88c313400e86e
2020-05-21 18:48:49 -04:00
Madelyn Olson
5109f16b77
EAGAIN for tls during diskless load
2020-05-21 15:20:59 -07: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
06a59fd44d
using moreargs variable
2020-05-21 18:13:35 -04:00
John Sully
3324d4dc0f
Merge commit '5719b3054a534e62c25ae97680ecd4f7238ba484' into unstable
...
Former-commit-id: 3e03f308b564cd94f4a6407c80792d080e0f83c5
2020-05-21 17:55:09 -04:00
John Sully
b6500a08dc
Merge commit '026cc11b056f063631d990f1a9db45b4e583974e' into unstable
...
Former-commit-id: 95cecb0229af0278cf614ffd746ba829ae7c897c
2020-05-21 17:45:15 -04:00
John Sully
c4db71f971
Merge commit '024c380b9da02bc4112822c0f5f9ac1388b4205b' into unstable
...
Former-commit-id: 7676f5b15f24a044257250b8891d23b14642da48
2020-05-21 17:36: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
ba7483c20b
Merge commit 'c35a53169ffdbdf73f91224b6e62f6129fb9a838' into unstable
...
Former-commit-id: 7a15f6dfc7331d6759201137971e7c2965672be8
2020-05-21 17:30:56 -04:00
hwware
5edb1beb63
fix server crash for STRALGO command
2020-05-21 17:30:36 -04: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
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
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
86f0e873c7
Replace addDeferredMultiBulkLength with addReplyDeferredLen in comment
2020-05-21 21:45:35 +08:00
ShooterIT
9018ddc32a
Fix reply bytes calculation error
...
Fix #7275 .
2020-05-21 21:00:30 +08: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
4f3ff46a81
Tracking: flag CLIENT_TRACKING_BROKEN_REDIR when redir broken
2020-05-21 13:57:29 +08: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
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
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
39d1e39212
TLS: Improve tls-protocols clarity in redis.conf.
2020-05-20 15:14:23 +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
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
Salvatore Sanfilippo
d949e8fe18
Merge pull request #7196 from ShooterIT/benchmark
...
Redis Benchmark: make test data better
2020-05-19 16:16:38 +02:00
Salvatore Sanfilippo
a9200ed0b3
Merge pull request #7279 from hwware/benchmark_leak_fix
...
Redis-Benchmark: avoid potentical memmory leaking
2020-05-19 16:14:30 +02:00
Salvatore Sanfilippo
9fba05f758
Merge pull request #7232 from trevor211/handleHashTagWhenComputingHashSlot
...
Tcl client support hash tagged keys.
2020-05-19 09:23:44 +02:00
hwware
07e1417ef0
Redis-Benchmark: avoid potentical memmory leaking
2020-05-18 22:10:57 -04:00
hujie
edc1f7b176
fix clear USER_FLAG_ALLCOMMANDS flag in acl
...
in ACLSetUserCommandBit, when the command bit overflows, no operation
is performed, so no need clear the USER_FLAG_ALLCOMMANDS flag.
in ACLSetUser, when adding subcommand, we don't need to call
ACLGetCommandID ahead since subcommand may be empty.
2020-05-19 00:58:58 +08:00
ShooterIT
abff264000
Redis Benchmark: generate random test data
...
The function of generating random data is designed by antirez. See #7196 .
2020-05-18 18:18:27 +08:00
Salvatore Sanfilippo
bf3a67be43
Merge pull request #7252 from ShooterIT/dictsize
...
Use dictSize to get the size of dict in dict.c
2020-05-18 10:33:08 +02:00
Salvatore Sanfilippo
dd78f7463f
Merge pull request #7255 from madolson/dev-unstable-converge-hash-validation
...
Converge hash validation for adding and removing
2020-05-18 10:31:47 +02:00
Salvatore Sanfilippo
c9ef9f1c48
Merge pull request #7247 from bsergean/patch-3
...
Redis-cli 6.0.1 `--cluster-yes` doesn't work (fix #7246 )
2020-05-18 10:23:54 +02:00
Salvatore Sanfilippo
05db78e9c5
Merge pull request #7271 from oranagra/fix_valgrind_repl_test
...
fix valgrind test failure in replication test
2020-05-18 10:09:39 +02:00
Oran Agra
75c11d7fec
fix valgrind test failure in replication test
...
in b4416280c i added more keys to that test to make it run longer
but in valgrind this now means the test times out, give valgrind more
time.
2020-05-18 10:26:53 +03:00