summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4311 from oranagra/aof_shutdown_flushSalvatore Sanfilippo2017-09-181-1/+2
|\ | | | | Flush append only buffers before existing.
| * Flush append only buffers before existing.Oran Agra2017-09-171-1/+2
|/ | | | | | when SHUTDOWN command is recived it is possible that some of the recent command were not yet flushed from the AOF buffer, and the server experiences data loss at shutdown.
* Merge pull request #4191 from jybaek/unstableSalvatore Sanfilippo2017-08-031-0/+1
|\ | | | | Add missing fclose()
| * Add missing fclose()jybaek2017-08-031-0/+1
|/
* Merge pull request #3935 from itamarhaber/module-cmdstatsSalvatore Sanfilippo2017-08-021-10/+17
|\ | | | | Changes command stats iteration to being dict-based
| * Changes command stats iteration to being dict-basedItamar Haber2017-04-131-10/+17
| | | | | | | | | | | | With the addition of modules, looping over the redisCommandTable misses any added commands. By moving to dictionary iteration this is resolved.
* | Add MEMORY DOCTOR to MEMORY HELP.antirez2017-07-281-1/+3
| |
* | Merge pull request #1934 from badboy/install-script-1922Salvatore Sanfilippo2017-07-241-6/+6
|\ \ | | | | | | Don't use extended Regexp Syntax
| * | Don't use extended Regexp SyntaxJan-Erik Rediger2014-08-131-6/+6
| | | | | | | | | | | | | | | | | | It's not POSIX (BSD systems have -E instead) and we don't actually need it. Closes #1922
* | | Merge pull request #2259 from badboy/fix-2258Salvatore Sanfilippo2017-07-241-2/+3
|\ \ \ | | | | | | | | Check that the whole first argument is a number
| * | | Check that the whole first argument is a numberJan-Erik Rediger2015-01-071-2/+3
| | | | | | | | | | | | | | | | Fixes #2258
* | | | Merge pull request #4124 from lamby/proceding-proceeding-typoSalvatore Sanfilippo2017-07-241-1/+1
|\ \ \ \ | | | | | | | | | | Correct proceding -> proceeding typo.
| * | | | Correct proceding -> proceeding typo.Chris Lamb2017-07-141-1/+1
| | | | |
* | | | | Merge pull request #4125 from trevor211/fixAutoAofRewirteMinSizeSalvatore Sanfilippo2017-07-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fix rewrite config: auto-aof-rewrite-min-size
| * | | | | fix rewrite config: auto-aof-rewrite-min-sizeWuYunlong2017-07-151-2/+2
| | | | | |
* | | | | | Merge pull request #1998 from grobe0ba/unstableSalvatore Sanfilippo2017-07-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix missing '-' in redis-benchmark help output (Issue #1996)
| * | | | | | Fixed issue #1996 (Missing '-' in help message for redis-benchmark)Byron Grobe2014-09-111-1/+1
| | | | | | |
* | | | | | | Merge pull request #4128 from leonchen83/unstableSalvatore Sanfilippo2017-07-241-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix mismatch argument and return wrong value of clusterDelNodeSlots
| * | | | | | | fix return wrong value of clusterDelNodeSlotsLeon Chen2017-07-201-2/+4
| | | | | | | |
| * | | | | | | fix mismatch argumentLeon Chen2017-07-181-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4154 from liangsijian/unstableSalvatore Sanfilippo2017-07-241-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix lua ldb command log
| * | | | | | | Fix lua ldb command logliangsijian2017-07-241-0/+1
|/ / / / / / /
* | | | | | | Modules: don't crash when Lua calls a module blocking command.antirez2017-07-231-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lua scripting does not support calling blocking commands, however all the native Redis commands are flagged as "s" (no scripting flag), so this is not possible at all. With modules there is no such mechanism in order to flag a command as non callable by the Lua scripting engine, moreover we cannot trust the modules users from complying all the times: it is likely that modules will be released to have blocking commands without such commands being flagged correctly, even if we provide a way to signal this fact. This commit attempts to address the problem in a short term way, by detecting that a module is trying to block in the context of the Lua scripting engine client, and preventing to do this. The module will actually believe to block as usually, but what happens is that the Lua script receives an error immediately, and the background call is ignored by the Redis engine (if not for the cleanup callbacks, once it unblocks). Long term, the more likely solution, is to introduce a new call called RedisModule_GetClientFlags(), so that a command can detect if the caller is a Lua script, and return an error, or avoid blocking at all. Being the blocking API experimental right now, more work is needed in this regard in order to reach a level well blocking module commands and all the other Redis subsystems interact peacefully. Now the effect is like the following: 127.0.0.1:6379> eval "redis.call('hello.block',1,5000)" 0 (error) ERR Error running script (call to f_b5ba35ff97bc1ef23debc4d6e9fd802da187ed53): @user_script:1: ERR Blocking module command called from Lua script This commit fixes issue #4127 in the short term.
* | | | | | | Fix typo in unblockClientFromModule() top comment.antirez2017-07-231-1/+1
| | | | | | |
* | | | | | | Make representClusterNodeFlags() more robust.antirez2017-07-201-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function failed when an internal-only flag was set as an only flag in a node: the string was trimmed expecting a final comma before exiting the function, causing a crash. See issue #4142. Moreover generation of flags representation only needed at DEBUG log level was always performed: a waste of CPU time. This is fixed as well by this commit.
* | | | | | | Fix two bugs in moduleTypeLookupModuleByID().antirez2017-07-201-4/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function cache was not working at all, and the function returned wrong values if there where two or more modules exporting native data types. See issue #4131 for more details.
* | | | | | changelog.tcl: output 100 lines.antirez2017-07-141-1/+1
| | | | | |
* | | | | | Modules: fix thread safe context DB selection.antirez2017-07-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix the DB currenty selected by the client blocked was not respected and operations were always performed on DB 0.
* | | | | | Allow certain modules APIs only defining REDISMODULE_EXPERIMENTAL_API.antirez2017-07-142-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those calls may be subject to changes in the future, so the user should acknowledge it is using non stable API.
* | | | | | Modules documentation removed from source.antirez2017-07-144-2830/+0
| | | | | | | | | | | | | | | | | | | | | | | | Moving to redis-doc repository to publish via Redis.io.
* | | | | | Markdown generation of Redis Modules API reference improved.antirez2017-07-142-74/+83
| |/ / / / |/| | | |
* | | | | Fix replication of SLAVEOF inside transaction.antirez2017-07-122-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Redis 4.0 replication, with the introduction of PSYNC2, masters and slaves replicate commands to cascading slaves and to the replication backlog itself in a different way compared to the past. Masters actually replicate the effects of client commands. Slaves just propagate what they receive from masters. This mechanism can cause problems when the configuration of an instance is changed from master to slave inside a transaction. For instance we could send to a master instance the following sequence: MULTI SLAVEOF 127.0.0.1 0 EXEC SLAVEOF NO ONE Before the fixes in this commit, the MULTI command used to be propagated into the replication backlog, however after the SLAVEOF command the instance is a slave, so the EXEC implementation failed to also propagate the EXEC command. When the slaves of the above instance reconnected, they were incrementally synchronized just sending a "MULTI". This put the master client (in the slaves) into MULTI state, breaking the replication. Notably even Redis Sentinel uses the above approach in order to guarantee that configuration changes are always performed together with rewrites of the configuration and with clients disconnection. Sentiel does: MULTI SLAVEOF ... CONFIG REWRITE CLIENT KILL TYPE normal EXEC So this was a really problematic issue. However even with the fix in this commit, that will add the final EXEC to the replication stream in case the instance was switched from master to slave during the transaction, the result would be to increment the slave replication offset, so a successive reconnection with the new master, will not permit a successful partial resynchronization: no way the new master can provide us with the backlog needed, we incremented our offset to a value that the new master cannot have. However the EXEC implementation waits to emit the MULTI, so that if the commands inside the transaction actually do not need to be replicated, no commands propagation happens at all. From multi.c: if (!must_propagate && !(c->cmd->flags & (CMD_READONLY|CMD_ADMIN))) { execCommandPropagateMulti(c); must_propagate = 1; } The above code is already modified by this commit you are reading. Now also ADMIN commands do not trigger the emission of MULTI. It is actually not clear why we do not just check for CMD_WRITE... Probably I wrote it this way in order to make the code more reliable: better to over-emit MULTI than not emitting it in time. So this commit should indeed fix issue #3836 (verified), however it looks like some reconsideration of this code path is needed in the long term. BONUS POINT: The reverse bug. Even in a read only slave "B", in a replication setup like: A -> B -> C There are commands without the READONLY nor the ADMIN flag, that are also not flagged as WRITE commands. An example is just the PING command. So if we send B the following sequence: MULTI PING SLAVEOF NO ONE EXEC The result will be the reverse bug, where only EXEC is emitted, but not the previous MULTI. However this apparently does not create problems in practice but it is yet another acknowledge of the fact some work is needed here in order to make this code path less surprising. Note that there are many different approaches we could follow. For instance MULTI/EXEC blocks containing administrative commands may be allowed ONLY if all the commands are administrative ones, otherwise they could be denined. When allowed, the commands could simply never be replicated at all.
* | | | | CLUSTER GETKEYSINSLOT: avoid overallocating.antirez2017-07-111-0/+5
| | | | | | | | | | | | | | | | | | | | Close #3911.
* | | | | Fix isHLLObjectOrReply() to handle integer encoded strings.antirez2017-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | Close #3766.
* | | | | Clients blocked in modules: free argv/argc later.antirez2017-07-112-3/+15
| | | | | | | | | | | | | | | | | | | | See issue #3844 for more information.
* | | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2017-07-111-30/+55
|\ \ \ \ \
| * \ \ \ \ Merge pull request #4113 from guybe7/module_io_bytesSalvatore Sanfilippo2017-07-101-30/+55
| |\ \ \ \ \ | | | | | | | | | | | | | | Modules: Fix io->bytes calculation in RDB save
| | * | | | | Modules: Fix io->bytes calculation in RDB saveGuy Benoish2017-07-101-30/+55
| | | | | | |
* | | | | | | Event loop: call after sleep() only from top level.antirez2017-07-112-2/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In general we do not want before/after sleep() callbacks to be called when we re-enter the event loop, since those calls are only designed in order to perform operations every main iteration of the event loop, and re-entering is often just a way to incrementally serve clietns with error messages or other auxiliary operations. However, if we call the callbacks, we are then forced to think at before/after sleep callbacks as re-entrant, which is much harder without any good need. However here there was also a clear bug: beforeSleep() was actually never called when re-entering the event loop. But the new afterSleep() callback was. This is broken and in this instance re-entering afterSleep() caused a modules GIL dead lock.
* | | | | | redis-check-aof: tell users there is a --fix option.antirez2017-07-101-1/+2
| | | | | |
* | | | | | AOF check utility: ability to check files with RDB preamble.antirez2017-07-106-35/+61
|/ / / / /
* | | | | Merge pull request #3853 from itamarhaber/issue-3851Salvatore Sanfilippo2017-07-061-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Sets up fake client to select current db in RM_Call()
| * | | | | Sets up fake client to select current db in RM_Call()itamar2017-03-061-0/+1
| | | | | |
* | | | | | Merge pull request #4105 from spinlock/unstable-networkingSalvatore Sanfilippo2017-07-062-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Optimize addReplyBulkSds for better performance
| * | | | | | update Makefile for test-sdsspinlock2017-07-051-1/+1
| | | | | | |
| * | | | | | Optimize addReplyBulkSds for better performancespinlock2017-07-051-2/+1
| | | | | | |
* | | | | | | Merge pull request #4106 from petersunbag/unstableSalvatore Sanfilippo2017-07-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | minor fix in listJoin().
| * | | | | | | minor fix in listJoin().sunweinan2017-07-061-1/+1
| | | | | | | |
* | | | | | | | Free IO context if any in RDB loading code.antirez2017-07-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to @oranagra for spotting this bug.
* | | | | | | | Modules: DEBUG DIGEST interface.antirez2017-07-065-1/+108
| | | | | | | |