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
Wen Hui
ed995ffa03
[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
Madelyn Olson
875a1f07d8
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
patpatbear
d070546568
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
511be70eba
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
Oran Agra
840f7f61c5
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
Wang Yuan
9d69d6e8fb
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
yoav-steinberg
15c078df61
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
992d515b05
Merge remote-tracking branch 'collab/keydbpro' into multithread_load
...
Former-commit-id: a09454b3a4b295b2d04bdb7d742db7f9a3e17be7
2021-05-31 01:16:01 +00:00
John Sully
721e572275
Merge remote-tracking branch 'collab/keydbpro' into multithread_load
...
Former-commit-id: a09454b3a4b295b2d04bdb7d742db7f9a3e17be7
2021-05-31 01:16:01 +00:00
John Sully
537450bc5d
Merge branch 'keydbpro' into keydbpro_collab
...
Former-commit-id: 40187ebd4cc479fa86a3ee5cca9bedef7d488ee7
2021-05-31 01:15:30 +00:00
John Sully
7af5eb2ee3
Merge branch 'keydbpro' into keydbpro_collab
...
Former-commit-id: 40187ebd4cc479fa86a3ee5cca9bedef7d488ee7
2021-05-31 01:15:30 +00:00
John Sully
4c88843720
Eliminate unnecessary global locks
...
Former-commit-id: 8f924ed0979f3cf7cd290395d1b1eec358979325
2021-05-31 01:14:28 +00:00
John Sully
ac49c7158c
Eliminate unnecessary global locks
...
Former-commit-id: 8f924ed0979f3cf7cd290395d1b1eec358979325
2021-05-31 01:14:28 +00:00
John Sully
5d525a8830
Fix deadlock in async work queue
...
Former-commit-id: 3265f2908e8d3aa567b3b9e6b141a7881c795053
2021-05-31 01:14:11 +00:00
John Sully
a2010f17b8
Fix deadlock in async work queue
...
Former-commit-id: 3265f2908e8d3aa567b3b9e6b141a7881c795053
2021-05-31 01:14:11 +00: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
d1337c9bbe
Don't pass on flags indicating membership in a list
...
Former-commit-id: b1f662d6393eea77c2870c8a1f955374b1a3b57f
2021-05-30 05:11:18 +00:00
John Sully
702bfaee9b
Merge branch 'unstable' into keydbpro
...
Former-commit-id: 4fd95b064648ee3d02097a1c2dabf306978b44f9
2021-05-30 04:28:09 +00:00
John Sully
0a0f610f17
Merge branch 'unstable' into keydbpro
...
Former-commit-id: 4fd95b064648ee3d02097a1c2dabf306978b44f9
2021-05-30 04:28:09 +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
54f921aae9
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
f3d74cf075
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
542a83edec
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
24377fa8fc
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
eb1bf61a58
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
4f690c1f81
Don't leak AE control pipes to fork children
...
Former-commit-id: 1ed2e8b5bcb485f7d1e073545a190bb95405a7d6
2021-05-30 02:06:20 +00:00
John Sully
989799df85
Merge branch 'unstable' into keydbpro
...
Former-commit-id: 14c24ce161ddcbddb701a20062659261397cb0e4
2021-05-29 06:49:05 +00:00
John Sully
11cd2d6776
Merge branch 'unstable' into keydbpro
...
Former-commit-id: 14c24ce161ddcbddb701a20062659261397cb0e4
2021-05-29 06:49:05 +00:00
John Sully
1b29ba5873
Mac build break fixes
...
Former-commit-id: 083b54472c65239b03c8a17f6b1ae6447d273e9a
2021-05-28 22:40:03 -04:00
John Sully
292bf82483
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
97d6875862
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
0cdb32f3e4
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
eb000a8c0f
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
76a47aa3e1
Make processClients reentrant
...
Former-commit-id: e39bdb58ec28d80c5ed2cf15ef6bc7b884e14d4b
2021-05-29 01:08:14 +00:00