12612 Commits

Author SHA1 Message Date
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
John Sully
1b29ba5873 Mac build break fixes
Former-commit-id: 083b54472c65239b03c8a17f6b1ae6447d273e9a
2021-05-28 22:40:03 -04:00
John Sully
ef5bf1fdd7 Prevent partial sync in test that requires only full syncs
Former-commit-id: 1b9fea066914d7f23d6bec220f26b8c0112d7f8b
2021-05-29 02:22:20 +00: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
cec7f98f34 Use correct make flags
Former-commit-id: 682990eeb31046b8c1f41012b3039cfad71b8bea
2021-05-29 01:07:35 +00:00
John Sully
007f276a43 Repair async rehash code removed by merge
Former-commit-id: 14a3ab8133c474bf8f1ad636c8699d5d59c5394e
2021-05-29 00:24:46 +00:00
John Sully
f4151f0d6b Merge branch 'unstable' into keydbpro
Former-commit-id: 205d8f18d2bb8df5253bab40578b006b7aa73fd5
2021-05-28 23:32: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
malavan
5043fb4091 fix leak caused by dict entry not being added to GCList
Former-commit-id: d8c1b3b6ec64f63fdff04d53102e4563c2c6764a
2021-05-26 17:01:51 +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
John Sully
2fa0085988 Build break fix: Remove dependency on future C++ feature
Former-commit-id: 87d7fc8e5d78a996562c477ecc0833c63f6fd8d7
2021-05-25 18:52:08 +00:00
John Sully
f5dc441dff More OS X build breaks
Former-commit-id: 100a747eabf42bccbcf2991349be0fb3810799b6
2021-05-25 18:35:45 +00:00
John Sully
9992f14de8 OS X build break fix
Former-commit-id: 105fd03ef8cd810e67c01e4d5a3ea7816e215a99
2021-05-25 18:32:31 +00:00
John Sully
f1c3a9ffc8 Fix uninitialized variable
Former-commit-id: 9395a9c1d90859f88f3d82d66e50083c8409a3f8
2021-05-25 18:30:07 +00:00
John Sully
e8b330f4ff Fix duplicate checks (resolve PR comments)
Former-commit-id: 02f7efd9d4804b71765ae11d7fcf7adca46af750
2021-05-25 16:57:49 +00:00
John Sully
87f706f8e7 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
John Sully
ea6a0f214b 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
John Sully
f49d8f9adb Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
2021-05-19 02:59:48 +00:00
John Sully
42f98c27e3 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
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
christian
3d424defd5 Set repl_down_since in freeClientAsync
Former-commit-id: fb4bd2984651837fadd1dbbbb56327e8452b4a2a
2021-05-03 21:41:04 +00:00
Oran Agra
439c356fe6 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
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
832b768248 Fix integer overflow in intset (CVE-2021-29478)
An integer overflow bug in Redis 6.2 could be exploited to corrupt the heap and
potentially result with remote code execution.

The vulnerability involves changing the default set-max-intset-entries
configuration value, creating a large set key that consists of integer values
and using the COPY command to duplicate it.

The integer overflow bug exists in all versions of Redis starting with 2.6,
where it could result with a corrupted RDB or DUMP payload, but not exploited
through COPY (which did not exist before 6.2).

(cherry picked from commit 29900d4e6bccdf3691bedf0ea9a5d84863fa3592)
2021-05-03 22:57:00 +03:00
sundb
23e126a993 Fix memory leak in moduleDefragGlobals (#8853)
(cherry picked from commit 5100ef9f8246dec6590f35f6b9f0b88c2dea0cfb)
2021-05-03 22:57:00 +03:00
Huang Zhw
02bd008bd1 Improve redis-cli help. When help command, we only match command (#8879)
prefix args not all args. So when we help commands with subcommands,
all subcommands will be output.

(cherry picked from commit 0b1b9edb2843730b03f78b6073cdd30873dbba95)
2021-05-03 22:57:00 +03:00
Binbin
0d10460235 redis-benchmark: Add zfree(data) and fix lrange size / text mismatch (#8872)
missing zfree(data) in redis-benchmark.

And also correct the wrong size in lrange.
the text mentioned 500, but size was 450, changed to 500

(cherry picked from commit 1eff8564c78011f7257e485796990a0d4d607a5b)
2021-05-03 22:57:00 +03:00
Binbin
e919deac12 redis-cli: Do not use hostsocket when we got redirected in cluster mode (#8870)
When redis-cli was used with both -c (cluster) and -s (unix socket),
it would have kept trying to use that unix socket, even if it got
redirected by the cluster (resulting in an infinite loop).

(cherry picked from commit 416f2773395ffcd72d8d8408e1558f49d59a0077)
2021-05-03 22:57:00 +03:00
filipe oliveira
ee542fbbd9 redis-benchmark: Error/Warning handling updates. (#8869)
- Immediately exit on errors that are not related to topology updates.
- Deprecates the `-e` option ( retro compatible ) and warns that we now
  exit immediately on errors that are not related to topology updates.
- Fixed wrongfully failing on config fetch error (warning only). This only affects RE.

Bottom line:
- MOVED and ASK errors will not show any warning (unlike the throttled error with `-e` before).
- CLUSTERDOWN still prints an error unconditionally and sleeps for 1 second.
- other errors are fatal.

(cherry picked from commit ef6f902372d4646b1894ec5dbd5f857dea5688d6)
2021-05-03 22:57:00 +03:00
Huang Zhw
9868ad801d Fix potential CONFIG SET bind test failure. (#8875)
Use an invalid IP address to trigger CONFIG SET bind failure, instead of DNS which is not guaranteed to always fail.

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