summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ACL LOG: make max log entries configurable.acl-logantirez2020-02-044-0/+19
|
* ACL LOG: test for AUTH reason.antirez2020-02-041-0/+9
|
* ACL LOG: log failed auth attempts.antirez2020-02-045-12/+34
|
* ACL LOG: implement a few basic tests.antirez2020-01-301-0/+87
|
* ACL LOG: also log ACL errors in the scripting/MULTI ctx.antirez2020-01-302-2/+6
|
* ACL LOG: implement LOG RESET.antirez2020-01-291-2/+6
|
* ACL LOG: group similar entries in a given time delta.antirez2020-01-291-3/+58
|
* ACL LOG: actually emit entries.antirez2020-01-283-5/+34
|
* ACL LOG: implement ACL LOG subcommadn skeleton.antirez2020-01-281-0/+37
|
* ACL LOG: data structures and initial functions.antirez2020-01-275-5/+54
|
* Change error message for #6775.antirez2020-01-151-2/+2
|
* Merge pull request #6775 from ↵Salvatore Sanfilippo2020-01-151-1/+4
|\ | | | | | | | | SqREL/make-error-of-invalid-command-withing-context-explicit Make error when submitting command in incorrect context more explicit
| * Make error when submitting command in incorrect context more explicitVasyl Melnychuk2020-01-101-1/+4
| | | | | | | | | | So error message `ERR only (P)SUBSCRIBE / (P)UNSUBSCRIBE / PING / QUIT allowed in this context` will become `ERR 'get' command submitted, but only (P)SUBSCRIBE / (P)UNSUBSCRIBE / PING / QUIT allowed in this context`
* | Document I/O threads in redis.conf.antirez2020-01-131-0/+46
| |
* | Setting N I/O threads should mean N-1 additional + 1 main thread.antirez2020-01-131-22/+25
| |
* | Simplify #6379 changes.antirez2020-01-132-9/+4
| |
* | Merge pull request #6739 from trevor211/fixMemoryLeakSalvatore Sanfilippo2020-01-133-6/+25
|\ \ | | | | | | Fix potential memory leak of rioWriteBulkStreamID().
| * | Free allocated sds in pfdebugCommand() to avoid memory leak.WuYunlong2020-01-071-0/+1
| | |
| * | Fix potential memory leak of clusterLoadConfig().WuYunlong2020-01-071-5/+20
| | |
| * | Fix potential memory leak of rioWriteBulkStreamID().WuYunlong2020-01-061-1/+4
| | |
* | | Jump to right label on AOF parsing error.antirez2020-01-131-4/+6
| | | | | | | | | | | | Related to #6054.
* | | Port PR #6110 to new connection object code.antirez2020-01-131-2/+2
| | |
* | | A few comments about main thread serving I/O as well.antirez2020-01-131-1/+7
| | | | | | | | | | | | Related to #6110.
* | | Merge pull request #6110 from soloestoy/enhance-io-threadedSalvatore Sanfilippo2020-01-131-3/+18
|\ \ \ | |_|/ |/| | Enhance IO Threaded: use main thread to handle read/write work
| * | Threaded IO: use main thread to handle read workzhaozhao.zz2019-05-211-1/+8
| | |
| * | Threaded IO: use main thread to handle write workzhaozhao.zz2019-05-211-2/+10
| | |
* | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-01-103-2/+9
|\ \ \
| * \ \ Merge pull request #6114 from ShooterIT/async-rename-rdbSalvatore Sanfilippo2020-01-101-0/+7
| |\ \ \ | | | | | | | | | | Rename rdb when replica finish receiving rdb asynchronously
| | * | | Rename rdb asynchronouslyShooterIT2019-12-311-0/+7
| | | | |
| * | | | Merge pull request #6746 from leomurillo/unstableSalvatore Sanfilippo2020-01-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | Fix bug on KEYS command where pattern starts with * followed by \x00
| | * | | | Fix bug on KEYS command where pattern starts with * followed by \x00 (null ↵Leo Murillo2020-01-071-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | char).
| * | | | Merge pull request #6457 from IAmATeaPot418/patch-1Salvatore Sanfilippo2020-01-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | Update to directive in redis.conf (missing s)
| | * | | | Update to directive in redis.conf (missing s)Jamie Scott2019-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The directive tls-prefer-server-cipher is actually tls-prefer-server-ciphers in config.c. This results in a failed directive call shown below. This pull request adds the "s" in ciphers so that the directive is able to be properly called in config.c ubuntu@ip-172-31-16-31:~/redis$ src/redis-server ./redis.conf *** FATAL CONFIG FILE ERROR *** Reading the configuration file, at line 200 >>> 'tls-prefer-server-cipher yes' Bad directive or wrong number of arguments
* | | | | | Free fakeclient argv on AOF error.antirez2020-01-101-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We exit later, so no bug fixed, but it is more correct. See #6054, thanks to @ShooterIT for finding the issue.
* | | | | | Git ignore: ignore more files.antirez2020-01-101-0/+2
|/ / / / /
* | | | | Merge pull request #6703 from guybe7/blocking_xread_empty_replySalvatore Sanfilippo2020-01-093-10/+44
|\ \ \ \ \ | | | | | | | | | | | | Blocking XREAD[GROUP] should always reply with valid data (or timeout)
| * | | | | Blocking XREAD[GROUP] should always reply with valid data (or timeout)Guy Benoish2019-12-303-10/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit solves the following bug: 127.0.0.1:6379> XGROUP CREATE x grp $ MKSTREAM OK 127.0.0.1:6379> XADD x 666 f v "666-0" 127.0.0.1:6379> XREADGROUP GROUP grp Alice BLOCK 0 STREAMS x > 1) 1) "x" 2) 1) 1) "666-0" 2) 1) "f" 2) "v" 127.0.0.1:6379> XADD x 667 f v "667-0" 127.0.0.1:6379> XDEL x 667 (integer) 1 127.0.0.1:6379> XREADGROUP GROUP grp Alice BLOCK 0 STREAMS x > 1) 1) "x" 2) (empty array) The root cause is that we use s->last_id in streamCompareID while we should use the last *valid* ID
* | | | | | Merge pull request #6724 from JohnSully/incrementalSalvatore Sanfilippo2020-01-092-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support for incremental build with header files
| * | | | | | Add support for incremental build with header filesJohn Sully2020-01-012-1/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #6715 from trevor211/fixPotentialClusterLinkErrorSalvatore Sanfilippo2020-01-091-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix petential cluster link error.
| * | | | | | Fix petential cluster link error.WuYunlong2019-12-311-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Funcion adjustOpenFilesLimit() has an implicit parameter, which is server.maxclients. This function aims to ajust maximum file descriptor number according to server.maxclients by best effort, which is "bestlimit" could be lower than "maxfiles" but greater than "oldlimit". When we try to increase "maxclients" using CONFIG SET command, we could increase maximum file descriptor number to a bigger value without calling aeResizeSetSize the same time. When later more and more clients connect to server, the allocated fd could be bigger and bigger, and eventually exceeds events size of aeEventLoop.events. When new nodes joins the cluster, new link is created, together with new fd, but when calling aeCreateFileEvent, we did not check the return value. In this case, we have a non-null "link" but the associated fd is not registered. So when we dynamically set "maxclients" we could reach an inconsistency between maximum file descriptor number of the process and server.maxclients. And later could cause cluster link and link fd inconsistency. While setting "maxclients" dynamically, we consider it as failed when resulting "maxclients" is not the same as expected. We try to restore back the maximum file descriptor number when we failed to set "maxclients" to the specified value, so that server.maxclients could act as a guard as before.
* | | | | | Merge pull request #6698 from yossigo/ctx-flags-multi-dirtySalvatore Sanfilippo2020-01-082-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add REDISMODULE_CTX_FLAGS_MULTI_DIRTY.
| * | | | | | Add REDISMODULE_CTX_FLAGS_MULTI_DIRTY.Yossi Gottlieb2019-12-232-0/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6748 from hwware/typofixSalvatore Sanfilippo2020-01-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | typo fix in acl.c
| * | | | | | typo fix in acl.chwware2020-01-071-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #6735 from itamarhaber/io-threadsSalvatore Sanfilippo2020-01-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adjusts 'io_threads_num' max in config.c
| * | | | | | Adjusts 'io_threads_num' max to 128Itamar Haber2020-01-041-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Instead of 512, use the defined max from networking.c
* | | | | | Merge pull request #6743 from yz1509/unstableSalvatore Sanfilippo2020-01-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Sentinel: avoid sentinel changes promoted_slave to be its own replica.
| * | | | | | avoid sentinel changes promoted_slave to be its own replica.yz15092020-01-071-1/+1
| |/ / / / /
* | | | | | XCLAIM: Create the consumer only on successful claims.antirez2020-01-081-2/+4
|/ / / / / | | | | | | | | | | | | | | | Fixes #6744.