John Sully
c0d1586f9a
Merge branch 'keydbpro' of https://gitlab.eqalpha.com/keydb-dev/KeyDB-Pro into keydbpro
...
Former-commit-id: 0f1b891c15ac27c4ad8a63a798c7dfa9fdcd2e01
2021-06-14 03:14:15 +00:00
jsully
386f6c649f
Merge branch 'merge_6.2.2' into 'keydbpro'
...
Merge 6.2.2
See merge request keydb-dev/KeyDB-Pro!21
Former-commit-id: c1076b2311e8bc1217b7f5030f5f5ebea1e98215
2021-06-14 03:14:03 +00:00
christianEQ
2417c7a593
several redis->keydb changes in sentinel.conf
...
Former-commit-id: d2ef0594711c83ec9223d2e3b26fce9b5a4f685f
2021-06-11 19:16:33 +00:00
christianEQ
3ea398ad5e
renamed redis mentions in runtest files
...
Former-commit-id: 2e894a512b30a8317619e55fa30a218306f8514f
2021-06-11 19:11:12 +00:00
christianEQ
e0aafaee37
renamed redis mention in readme
...
Former-commit-id: 34b0209f05d4f44e4b14278ad746f1eda679b32a
2021-06-11 19:10:35 +00:00
christianEQ
d0a3554de7
renamed workspace gitignore
...
Former-commit-id: 046f5756325992752b51d7ac601fd84d4faa53ce
2021-06-11 19:10:12 +00:00
christianEQ
c23c7f0ca4
renamed redis test files
...
Former-commit-id: 1c77104b5efcdfd1fce6a4a946e8a1ead35dc7f0
2021-06-11 19:09:40 +00:00
christianEQ
470c6550e4
removed unreliable musl test and left only accurate new one
...
Former-commit-id: 386be8990a83fcc5d57aa20a268544a877c2cfd7
2021-06-11 18:19:59 +00:00
christianEQ
f3c44c96f2
changed redis.pid to keydb.pid where necessary
...
Former-commit-id: 76d9c7c82abe7aecc7301d82e755953a37513138
2021-06-11 18:19:02 +00:00
christianEQ
f48be238b1
removed outdated comment in server.cpp
...
Former-commit-id: 98f08034a13341059b9b1690989e7ef0207ac920
2021-06-11 18:17:18 +00:00
christianEQ
1c6219643b
updated pkg/deb/conf/keydb.conf to use keydb name throughout
...
Former-commit-id: 308cf77437374f01cc40101f2f35768db7a16302
2021-06-11 18:15:50 +00:00
christianEQ
87316cb63c
removed the question issue template - doesn't seem necessary for us
...
Former-commit-id: ce64f469f404f79ae0028627e7ebfcc47781eeab
2021-06-11 18:08:19 +00:00
christianEQ
8ee834ea24
fixed flag var names in ci
...
Former-commit-id: e632c3db1b6c8b0294075e60533f40812c554b47
2021-06-11 17:04:33 +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
982067b16a
fixed code style for ifdef
...
Former-commit-id: 93c41fa31c91098af98d2bc0362eb29685cd6678
2021-06-02 15:02:27 +00:00
John Sully
d93360b96b
Merge branch 'keydbpro' of https://gitlab.eqalpha.com/keydb-dev/KeyDB-Pro into keydbpro
...
Former-commit-id: 6eb1417295ecc6ce23677e9a8e1c756579177629
2021-06-02 02:11:29 +00:00
John Sully
368441127f
Fix merge issue with wrong return type
...
Former-commit-id: 1640a2fefb8f09c7b6b335838f14a7fd3a51ae88
2021-06-02 02:10:00 +00:00
John Sully
18a2b27ef9
Merge branch 'unstable' into keydbpro
...
Former-commit-id: 657789db5c3bd0fbbfc15be150d6eb525554251c
2021-06-02 02:08:18 +00:00
jsully
3859bea711
Merge branch 'fixleakindictdelete' into 'keydbpro'
...
fix leak caused by dict entry not being added to GCList
See merge request keydb-dev/KeyDB-Pro!20
Former-commit-id: 92c8c6d854c3029269f695d0f9e4afe80c1e48f6
2021-06-02 00:01:52 +00:00
jsully
e5197d6801
Merge branch 'jesse/update-readme-build-instructions' into 'PRO_RELEASE_6'
...
Add additional libraries that need to be installed for building pro
See merge request keydb-dev/KeyDB-Pro!16
Former-commit-id: b18a4f718f40059c30dba6f8ceb2c7612dbcf392
2021-06-02 00:01:33 +00:00
jsully
838150179c
Merge branch 'monkey_blocking' into 'keydbpro'
...
Monkey Improvements
See merge request keydb-dev/KeyDB-Pro!13
Former-commit-id: 130434f01b4bd27c14502b005b5dc71daa6b9cae
2021-06-02 00:01:19 +00:00
christianEQ
0c41217fba
working diag tool prototype
...
Former-commit-id: fefbe96816f6a18ca6f8c8d3794502e6e610650f
2021-06-01 20:54:48 +00:00
John Sully
6e51487f09
Implement bulkInsert for rocksdb
...
Former-commit-id: e9abae77d6ae18e21d7dac0cbdd563f572ac3d03
2021-06-01 19:17:40 +00:00
John Sully
ceb98b062c
Initial bulkInsert implementation
...
Former-commit-id: 2a721d4dff3c9f78ec4ba1c7b490ea1f5d216a89
2021-06-01 19:15:01 +00:00
M Sazzadul Hoque
78d6597012
Fix 6.2.4 release month to June ( #9027 )
2021-06-01 19:03:06 +03: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
4c88843720
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
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
702bfaee9b
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
e5691036d9
Fix merge issue with module test script
...
Former-commit-id: 10d254ec1bcdd9c25e373bbf882db244fecb65d1
2021-05-30 02:45:06 +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
4142b86ff8
Fix branding
...
Former-commit-id: b20803b7669b10804fb0f355e302898ddaa19906
2021-05-29 07:08:01 +00:00
John Sully
71adde26d1
Fix cluster test failures
...
Former-commit-id: 8cf1daf823be0a40301a5dc288ec18f5bb98d60b
2021-05-29 07:07:54 +00:00
John Sully
989799df85
Merge branch 'unstable' into keydbpro
...
Former-commit-id: 14c24ce161ddcbddb701a20062659261397cb0e4
2021-05-29 06:49:05 +00:00