20927 Commits

Author SHA1 Message Date
John Sully
87f706f8e7 Fix TLS Build Errors
Former-commit-id: aea86c5977c01debb4f4a4340c866aa5c5f20f04
2021-05-25 16:55:59 +00:00
John Sully
caba5639f4 Fix TLS Build Errors
Former-commit-id: aea86c5977c01debb4f4a4340c866aa5c5f20f04
2021-05-25 16:55:59 +00:00
VivekSainiEQ
4933615dc1 Initialized serverTL in more places in module.cpp
Former-commit-id: 8d81592bec0a62b8f3eae6b8c924887839909e2c
2021-05-25 16:55:47 +00:00
VivekSainiEQ
68cdb2f1ad Initialized serverTL in more places in module.cpp
Former-commit-id: 8d81592bec0a62b8f3eae6b8c924887839909e2c
2021-05-25 16:55:47 +00:00
VivekSainiEQ
4fd76c4791 Fixed single threaded for real this time, need to add synchronization for multi threaded
Former-commit-id: 4d858dac1a503f4d518477212ba585069af22574
2021-05-21 17:05:55 +00:00
VivekSainiEQ
61fca72389 Fixed single threaded for real this time, need to add synchronization for multi threaded
Former-commit-id: 4d858dac1a503f4d518477212ba585069af22574
2021-05-21 17:05:55 +00:00
John Sully
ea6a0f214b Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17adec5d406d2e30a5b9ea71c07fce5c
2021-05-21 05:54:39 +00:00
John Sully
5267928381 Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17adec5d406d2e30a5b9ea71c07fce5c
2021-05-21 05:54:39 +00:00
christianEQ
a9552f9635 license status OK if not checking license
Former-commit-id: 6bfdc9d41dc638989d50f005af8d66e4ed47ce77
2021-05-20 19:09:02 +00:00
christianEQ
ac5b2b69f3 license status OK if not checking license
Former-commit-id: 6bfdc9d41dc638989d50f005af8d66e4ed47ce77
2021-05-20 19:09:02 +00:00
John Sully
f49d8f9adb Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
2021-05-19 02:59:48 +00:00
John Sully
fe8efa916b Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
2021-05-19 02:59:48 +00:00
Malavan
04fcf3e9b5 Fix issue with INVALID_EXPIRE overlapping with mask
Former-commit-id: a6bbbeffcf7b5af5e67517aed01cabae51169c0a
2021-05-17 21:38:42 +00:00
Malavan
9b201b31c3 Fix issue with INVALID_EXPIRE overlapping with mask
Former-commit-id: a6bbbeffcf7b5af5e67517aed01cabae51169c0a
2021-05-17 21:38:42 +00:00
Malavan
7859cbdf59 Merge remote-tracking branch 'upstream/unstable' into fixissue295
Former-commit-id: 9110747194f1a3627adc1a672600a1c6445b8de4
2021-05-17 21:35:43 +00:00
Malavan
7a799faa04 Merge remote-tracking branch 'upstream/unstable' into fixissue295
Former-commit-id: 9110747194f1a3627adc1a672600a1c6445b8de4
2021-05-17 21:35:43 +00:00
Malavan
26d1c80398 merge when and whenFull
Former-commit-id: 693b209cb42ea357b3cbc4a757730fa2ac001729
2021-05-15 05:48:23 +00:00
Malavan
fa533a5b62 merge when and whenFull
Former-commit-id: 693b209cb42ea357b3cbc4a757730fa2ac001729
2021-05-15 05:48:23 +00:00
Malavan
bafd03f53c Speedup keyIsExpired by removing subkey search
Former-commit-id: a01564158e40300ab4a0338c0a6e924972385407
2021-05-07 09:40:23 +00:00
Malavan
d0de1741ed Speedup keyIsExpired by removing subkey search
Former-commit-id: a01564158e40300ab4a0338c0a6e924972385407
2021-05-07 09:40:23 +00:00
John Sully
42f98c27e3 Fix test hang
Former-commit-id: 23647390e628de07759f8e7d8768a7f638edf01d
2021-05-07 00:28:10 +00:00
John Sully
61e054f826 Fix test hang
Former-commit-id: 23647390e628de07759f8e7d8768a7f638edf01d
2021-05-07 00:28:10 +00:00
VivekSainiEQ
501a065759 Changed branding in various locations
Former-commit-id: 96bca72bb4528a0789354ee4fd6bf3ab66d82bf7
2021-05-06 20:13:45 -04:00
VivekSainiEQ
7b982ae4c5 Changed branding in various locations
Former-commit-id: 96bca72bb4528a0789354ee4fd6bf3ab66d82bf7
2021-05-06 20:13:45 -04:00
John Sully
442aa5bbd9 Pause execution during rdbLoadProgressCallback as its too risky to let it run
Former-commit-id: e70c01cb3e756d1e02ed190b76c73b7b7010c0d3
2021-05-06 00:42:49 +00:00
John Sully
a8d177e758 Pause execution during rdbLoadProgressCallback as its too risky to let it run
Former-commit-id: e70c01cb3e756d1e02ed190b76c73b7b7010c0d3
2021-05-06 00:42:49 +00:00
John Sully
40fdb3ce05 Add endurance testing to better detect threading bugs
Former-commit-id: 945e428aa110968479fdcdfc2d5c5308a99eadc3
2021-05-06 00:09:07 +00:00
John Sully
10383a8234 Add endurance testing to better detect threading bugs
Former-commit-id: 945e428aa110968479fdcdfc2d5c5308a99eadc3
2021-05-06 00:09:07 +00:00
VivekSainiEQ
7ff2fb716a Fixed data race? Seems to be passing multithreaded test cases now
Former-commit-id: cb13edd1200c1230fa7e313d69c69e06129951d3
2021-05-05 22:26:36 +00:00
VivekSainiEQ
6e5c8246cc Fixed data race? Seems to be passing multithreaded test cases now
Former-commit-id: cb13edd1200c1230fa7e313d69c69e06129951d3
2021-05-05 22:26:36 +00:00
VivekSainiEQ
f6a714db26 Updated overhead calculation to only use repl_backlog_size
Former-commit-id: 6f93c7eb44d84bb143b4ad4fff3c6a5436ebaaf7
2021-05-05 17:04:08 +00:00
VivekSainiEQ
6da7989518 Updated overhead calculation to only use repl_backlog_size
Former-commit-id: 6f93c7eb44d84bb143b4ad4fff3c6a5436ebaaf7
2021-05-05 17:04:08 +00:00
Malavan
9a2d6cbad2 add lookup limit to active subkey expire
Former-commit-id: 5d6da23108401b3b554eaec5d7c78aa0950a28f2
2021-05-04 22:28:03 +00:00
Malavan
67f74ef465 add lookup limit to active subkey expire
Former-commit-id: 5d6da23108401b3b554eaec5d7c78aa0950a28f2
2021-05-04 22:28:03 +00:00
Malavan
6312005640 add lookup limit to active subkey expire
Former-commit-id: b44f504ced6b8259fd5b6553cec932b512e5dfa2
2021-05-04 21:34:25 +00:00
Malavan
c8144daafa add lookup limit to active subkey expire
Former-commit-id: b44f504ced6b8259fd5b6553cec932b512e5dfa2
2021-05-04 21:34:25 +00:00
John Sully
8e85eaf53e Merge branch 'keydbpro' into keydbpro_collab
Former-commit-id: 446daf8f4c33005096372ad9e29ae9b3d465c64e
2021-05-03 22:58:56 +00:00
John Sully
f41b79cea6 Merge branch 'keydbpro' into keydbpro_collab
Former-commit-id: 446daf8f4c33005096372ad9e29ae9b3d465c64e
2021-05-03 22:58:56 +00:00
jsully
de6e9845d2 Merge branch 'cluster_bugfix' into 'keydbpro'
Set repl_down_since in freeClientAsync

See merge request keydb-dev/KeyDB-Pro!12

Former-commit-id: bd7591fe50b1e5565da2fa521438b88058d4da07
2021-05-03 21:41:05 +00:00
jsully
fe9f276f95 Merge branch 'cluster_bugfix' into 'keydbpro'
Set repl_down_since in freeClientAsync

See merge request keydb-dev/KeyDB-Pro!12

Former-commit-id: bd7591fe50b1e5565da2fa521438b88058d4da07
2021-05-03 21:41:05 +00:00
christian
3d424defd5 Set repl_down_since in freeClientAsync
Former-commit-id: fb4bd2984651837fadd1dbbbb56327e8452b4a2a
2021-05-03 21:41:04 +00:00
christian
12044bab09 Set repl_down_since in freeClientAsync
Former-commit-id: fb4bd2984651837fadd1dbbbb56327e8452b4a2a
2021-05-03 21:41:04 +00:00
John Sully
0c5585e5de Ensure multithread load works with FLASH storage
Former-commit-id: 24e2991c7aa2cef90a89b1640f7095235c5d34ed
2021-05-03 20:18:45 +00:00
John Sully
443f3511a9 Ensure multithread load works with FLASH storage
Former-commit-id: 24e2991c7aa2cef90a89b1640f7095235c5d34ed
2021-05-03 20:18:45 +00:00
Oran Agra
439c356fe6 Redis 6.2.3 2021-05-03 22:57:00 +03:00
Oran Agra
e90e5640e7 Redis 6.2.3 2021-05-03 22:57:00 +03:00
Oran Agra
f72cad07e1 Resolve nonsense static analysis warnings
(cherry picked from commit fd7d51c353607f350c865155444bce9236f3d682)
2021-05-03 22:57:00 +03:00
Oran Agra
2df6695f2b Resolve nonsense static analysis warnings
(cherry picked from commit fd7d51c353607f350c865155444bce9236f3d682)
2021-05-03 22:57:00 +03:00
Oran Agra
fe0345931c Fix integer overflow in STRALGO LCS (CVE-2021-29477)
An integer overflow bug in Redis version 6.0 or newer could be exploited using
the STRALGO LCS command to corrupt the heap and potentially result with remote
code execution.

(cherry picked from commit f0c5f920d0f88bd8aa376a2c05af4902789d1ef9)
2021-05-03 22:57:00 +03:00
Oran Agra
92e3b1802f Fix integer overflow in STRALGO LCS (CVE-2021-29477)
An integer overflow bug in Redis version 6.0 or newer could be exploited using
the STRALGO LCS command to corrupt the heap and potentially result with remote
code execution.

(cherry picked from commit f0c5f920d0f88bd8aa376a2c05af4902789d1ef9)
2021-05-03 22:57:00 +03:00