John Sully
c0160a4415
Merge tag '6.2.3' into unstable
...
Former-commit-id: 1895dbb7680fa9aadf6040912e89c733abc8c706
2021-07-09 04:40:31 +00:00
christianEQ
cf23416296
added eq alpha copyright
...
Former-commit-id: a6cbbd0f318f3a091ed23dbdbcc1593f32fa5e25
2021-07-08 02:58:18 +00:00
christianEQ
145015dc51
fix for #323 : seg fault on expiremember
...
Former-commit-id: f1f52af9cfcac03a1af84265f7e5cb2172e8ebde
2021-07-08 02:50:05 +00:00
christianEQ
ea95e6c406
various branding and cleanup fixes
...
Former-commit-id: e3c619eca4755c96af83e1959a6ea5ba95734e93
2021-07-08 02:46:42 +00:00
christianEQ
e5939c5de9
removed unused command line options
...
Former-commit-id: 57e59d97db3674eb241f9bd0836e38f4c8356cac
2021-06-22 17:13:35 +00:00
christianEQ
6c5246fb09
changed --ms to --time
...
Former-commit-id: d7cada0f38668f67eb307172a3e91599b1f00a24
2021-06-21 19:57:14 +00:00
christianEQ
59102658a3
added more verbose options
...
Former-commit-id: fd2ac1fcfc94285cad683528f3d209b204ccfd2b
2021-06-21 18:40:37 +00:00
christianEQ
2bbb8a54fc
-t threads option
...
Former-commit-id: 0181b0e7a17ad5f83a544401110a9eac2b292aa4
2021-06-21 18:36:21 +00:00
christianEQ
0d9e0a9039
added starting line so diagnostic tool doesnt look frozen at first
...
Former-commit-id: 2b5e5cfa4cf1478682c46d74436025c63ac6c217
2021-06-18 20:21:47 +00:00
christianEQ
4028d35560
Merge remote-tracking branch 'origin/unstable' into diagnostic-tool
...
Former-commit-id: bfb0d02622dfc9ac0c67ec68ae8a21cccd5c9004
2021-06-18 20:19:31 +00:00
christianEQ
248059e50c
detect stagnating server load before 100% (diagnostic tool)
...
Former-commit-id: 534b70643b8f39303331048d3e86475caa08b864
2021-06-18 19:01:51 +00:00
christianEQ
b21b868de2
added config option for time to spin up new client threads (diagnostic tool)
...
Former-commit-id: 3d0f729572b175457d4874b6e381754ac47e9055
2021-06-18 16:58:16 +00:00
christianEQ
29e3f7da84
detect full load + server threads (diagnostic tool)
...
Former-commit-id: fd4ed1e425e32b628c5850e83c9ea9411c471bbe
2021-06-18 16:49:25 +00:00
christianEQ
4237c9d5ff
detect client cpu usage in diagnostic tool
...
Former-commit-id: 693450393c848679b60c5a9bf55428ae1d4f769f
2021-06-17 20:40:10 +00:00
christianEQ
fd72894fbf
accurate cpu usage in diagnostic tool
...
Former-commit-id: 8ee7584cffc5c5cacfb7ad20fc964112974683e4
2021-06-17 18:32:11 +00:00
christianEQ
9dd97c9c0d
changed redis_flags names to keydb in makefile
...
Former-commit-id: 07273936271536e4a57efdb7a31bc34e5b8d50f1
2021-06-14 16:09:42 +00:00
christianEQ
f48be238b1
removed outdated comment in server.cpp
...
Former-commit-id: 98f08034a13341059b9b1690989e7ef0207ac920
2021-06-11 18:17:18 +00:00
christianEQ
ea12db4433
don't enforce upper limit for requests issued; tool will run indefinitely
...
Former-commit-id: 239d22ed722357f0973c971b998b21f4f7b3b1da
2021-06-11 16:28:29 +00:00
christianEQ
0c41217fba
working diag tool prototype
...
Former-commit-id: fefbe96816f6a18ca6f8c8d3794502e6e610650f
2021-06-01 20:54:48 +00:00
Oran Agra
8728f68f66
Redis 6.2.4
2021-06-01 17:03:36 +03:00
Oran Agra
e55cc0e9f4
Fix integer overflow in STRALGO LCS (CVE-2021-32625) ( #9011 )
...
An integer overflow bug in Redis version 6.0 or newer can be exploited using the
STRALGO LCS command to corrupt the heap and potentially result with remote code
execution. This is a result of an incomplete fix by CVE-2021-29477.
(cherry picked from commit 1ddecf1958924b178b76a31d989ef1e05af81964)
2021-06-01 17:03:36 +03:00
YaacovHazan
bd2785d18b
unregister AE_READABLE from the read pipe in backgroundSaveDoneHandlerSocket ( #8991 )
...
In diskless replication, we create a read pipe for the RDB, between the child and the parent.
When we close this pipe (fd), the read handler also needs to be removed from the event loop (if it still registered).
Otherwise, next time we will use the same fd, the registration will be fail (panic), because
we will use EPOLL_CTL_MOD (the fd still register in the event loop), on fd that already removed from epoll_ctl
(cherry picked from commit 501d7755831527b4237f9ed6050ec84203934e4d)
2021-06-01 17:03:36 +03:00
Wen Hui
eb6d4da231
fix sentinel test failure ( #8983 )
...
fix for recent breakage from #8958 , did a mistake when updating the pr.
(cherry picked from commit be6ce8a92a9acbecfaaa6c57a45037fc1018fefe)
2021-06-01 17:03:36 +03:00
Wen Hui
efb7a5c630
[SENTINEL] reset sentinel-user/pass to NULL when user config with empty string ( #8958 )
...
(cherry picked from commit ae6f58690b91010d003cdf5552d74b8e5b428d53)
2021-06-01 17:03:36 +03:00
Madelyn Olson
f8938d868b
Hide migrate command from slowlog if they include auth ( #8859 )
...
Redact commands that include sensitive data from slowlog and monitor
(cherry picked from commit a59e75a475782d86d7ce2b5b9c6f5bb4a5ef0bd6)
2021-06-01 17:03:36 +03:00
patpatbear
2adf90348f
sinterstore: add missing keyspace del event when any source set not exists. ( #8949 )
...
this patch fixes sinterstore by add missing keyspace del event when any source set not exists.
Co-authored-by: srzhao <srzhao@sysnew.com>
(cherry picked from commit 46d9f31e94355ec15b95418377677bcf75839bc9)
2021-06-01 17:03:36 +03:00
Oran Agra
eca5e75b2a
Fix crash unlinking a stream with groups rax and no groups ( #8932 )
...
When estimating the effort for unlink, we try to compute the effort of
the first group and extrapolate.
If there's a groups rax that's empty, there'a an assertion.
reproduce:
xadd s * a b
xgroup create s bla $
xgroup destroy s bla
unlink s
(cherry picked from commit 97108845e2ae7661e5091c817cb03459ec81ea8c)
2021-06-01 17:03:36 +03:00
Oran Agra
f8e272f765
fix redis-benchmark to ignore unsupported configs ( #8916 )
...
Redis Enterprise supports the CONFIG GET command, but it replies with am
empty array since the save and appendonly configs are not supported.
before this fix redis-benchmark would segfault for trying to access the
error string on an array type reply.
see #8869
(cherry picked from commit 4d1094e8be3150b92b3e96d3a743c66b1a95988a)
2021-06-01 17:03:36 +03:00
Wang Yuan
435511f7c3
Fix wrong COW memory in log ( #8917 )
...
Always 0 MB of memory used by copy-on-write, introduced in #8645 .
(cherry picked from commit 81e2d7272b784273099fecd85b15473277296771)
2021-06-01 17:03:36 +03:00
yoav-steinberg
7059cfb432
Enforce client output buffer soft limit when no traffic. ( #8833 )
...
When client breached the output buffer soft limit but then went idle,
we didn't disconnect on soft limit timeout, now we do.
Note this also resolves some sporadic test failures in due to Linux
buffering data which caused tests to fail if during the test we went
back under the soft COB limit.
Co-authored-by: Oran Agra <oran@redislabs.com>
Co-authored-by: sundb <sundbcn@gmail.com>
(cherry picked from commit 152fce5e2cbf947a389da414a431f7331981a374)
2021-06-01 17:03:36 +03:00
John Sully
0bb036aebb
Don't pass on flags indicating membership in a list
...
Former-commit-id: b1f662d6393eea77c2870c8a1f955374b1a3b57f
2021-05-30 05:11:18 +00:00
John Sully
6331caca6a
Fix a leak in the benchmark
...
Former-commit-id: aa5b27b040c69f0c7d166203bed7110bc8c0bc87
2021-05-30 02:55:39 +00:00
John Sully
42f5d1a175
Ensure our connections are touched only on the right thread
...
Former-commit-id: e8a44821d016e9f9b8ca873757d4786c4c271b7c
2021-05-30 02:08:30 +00:00
John Sully
1a734223ca
Handle race where a different thread cancels the replication but we haven't closed the connection
...
Former-commit-id: 92e48f071792985c2fb7f4c722329e832cd4c77b
2021-05-30 02:08:02 +00:00
John Sully
f1ba462df6
Delete pipe on the right thread so event handlers are cleaned up
...
Former-commit-id: 9742c44db52929b755d6ecce16f91bee07f495ff
2021-05-30 02:07:31 +00:00
John Sully
f82860104e
Don't leave dangling client pointers in the process list
...
Former-commit-id: 5d16f519508fcb96a8803fcefa69d6c75fa174ac
2021-05-30 02:06:47 +00:00
John Sully
06560f9f85
Don't leak AE control pipes to fork children
...
Former-commit-id: 1ed2e8b5bcb485f7d1e073545a190bb95405a7d6
2021-05-30 02:06:20 +00:00
John Sully
1b29ba5873
Mac build break fixes
...
Former-commit-id: 083b54472c65239b03c8a17f6b1ae6447d273e9a
2021-05-28 22:40:03 -04:00
John Sully
4e70e85ab8
Fix failover command test failures
...
Former-commit-id: d3c37c7159a92319759a33851669862a82cf1b28
2021-05-29 01:19:12 +00:00
John Sully
f6067d1664
Remove dup'd code from merge
...
Former-commit-id: 807f0201845a698514f1ce9382338bc74ba57e5e
2021-05-29 01:08:52 +00:00
John Sully
bf77b1a03a
ProcessingEventsWhileBlocked is relevant only to the current thread
...
Former-commit-id: b400be68b7a45e73ea851c11dfee3fdcbacb4794
2021-05-29 01:08:43 +00:00
John Sully
1d0378e0dc
Make processClients reentrant
...
Former-commit-id: e39bdb58ec28d80c5ed2cf15ef6bc7b884e14d4b
2021-05-29 01:08:14 +00:00
John Sully
589e95e0c8
Don't have dangling expires
...
Former-commit-id: 83c8977033d79b6ec69e677dff19f68df53535be
2021-05-29 01:07:46 +00:00
John Sully
d414b5ee60
Ensure multi-thread handling of cached master is equivalent to single thread case
...
Former-commit-id: 7ee766aee13f501923afc127a74c79b29c0b0aa2
2021-05-26 17:29:47 +00:00
John Sully
c091050d4a
Avoid differences between single thread and multi-thread
...
Former-commit-id: 848c5ad784d6437533f6c86663b81e41e06a11ea
2021-05-26 17:29:01 +00:00
John Sully
b94b46a5ee
Eliminate test issue while clients wait for async free
...
Former-commit-id: a41fb1b036dd4a933093f1df6dffe16f820153e4
2021-05-26 01:18:47 +00:00
John Sully
02211afea8
Fix failure sending deferred aggregate lengths to clients on other threads (merge bug)
...
Former-commit-id: 915117ae7bac90fe41c7f36d97bcd654d6e90b62
2021-05-25 20:51:18 +00:00
John Sully
f6de98779f
Remove duplicate code
...
Former-commit-id: de5fa787625ae27ce16737b539a981a0dede091a
2021-05-25 20:50:40 +00:00
John Sully
84b8e80841
Fix TLS test failure due to tls-port not marked as runtime configurable
...
Former-commit-id: b0c8efd8407168d1d5435f417932323656efe109
2021-05-25 20:50:23 +00:00
John Sully
9939c0ac5c
Fix crash in TLS due to merge
...
Former-commit-id: 1dcd5edbf953b74c9186672f8f157c6bd56bcdf8
2021-05-25 18:52:27 +00:00