summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Modules: fix for scripting replication of modules commands.modules-replicationantirez2017-11-232-5/+7
| | | | See issue #4466 / #4467.
* rehash: handle one db until finishedzhaozhao.zz2017-11-211-2/+5
|
* Merge pull request #2741 from kmiku7/unstableSalvatore Sanfilippo2017-11-081-1/+1
|\ | | | | fix boundary case for _dictNextPower
| * fix boundary case for _dictNextPowerkmiku72015-08-231-1/+1
| |
* | Fixes an off-by-one in argument handling of `MEMORY USAGE`Itamar Haber2017-11-081-1/+1
| | | | | | Fixes #4430
* | Fix saving of zero-length lists.antirez2017-11-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally in modern Redis you can't create zero-len lists, however it's possible to load them from old RDB files generated, for instance, using Redis 2.8 (see issue #4409). The "Right Thing" would be not loading such lists at all, but this requires to hook in rdb.c random places in a not great way, for a problem that is at this point, at best, minor. Here in this commit instead I just fix the fact that zero length lists, materialized as quicklists with the first node set to NULL, were iterated in the wrong way while they are saved, leading to a crash. The other parts of the list implementation are apparently able to deal with empty lists correctly, even if they are no longer a thing.
* | SDS: improve sdsRemoveFreeSpace() to avoid useless data copy.antirez2017-11-031-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Since SDS v2, we no longer have a single header, so the function to rewrite the SDS in terms of the minimum space required, instead of just using realloc() and let the underlying allocator decide what to do, was doing an allocation + copy every time the minimum possible header needed to represent the string was different than the current one. This could be often a bit wasteful, because if we go, for instance, from the 32 bit fields header to the 16 bit fields header, the overhead of the header is normally very small. With this commit we call realloc instead, unless the change in header size is very significant in relation to the string length.
* | Fix buffer overflows occurring reading redis.conf.antirez2017-10-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was not enough sanity checking in the code loading the slots of Redis Cluster from the nodes.conf file, this resulted into the attacker's ability to write data at random addresses in the process memory, by manipulating the index of the array. The bug seems exploitable using the following techique: the config file may be altered so that one of the nodes gets, as node ID (which is the first field inside the structure) some data that is actually executable: then by writing this address in selected places, this node ID part can be executed after a jump. So it is mostly just a matter of effort in order to exploit the bug. In practice however the issue is not very critical because the bug requires an unprivileged user to be able to modify the Redis cluster nodes configuration, and at the same time this should result in some gain. However Redis normally is unprivileged as well. Yet much better to have this fixed indeed. Fix #4278.
* | More robust object -> double conversion.antirez2017-10-301-4/+8
| | | | | | | | | | | | | | | | | | Certain checks were useless, at the same time certain malformed inputs were accepted without problems (emtpy strings parsed as zero). Cases where strtod() returns ERANGE but we still want to parse the input where ok in getDoubleFromObject() but not in the long variant. As a side effect of these fixes, this commit fixes #4391.
* | Limit statement in RM_BlockClient() to 80 cols.antirez2017-09-281-4/+5
| |
* | Added safety net preventing redis from crashing if a module decide to block ↵Dvir Volk2017-09-271-5/+8
| | | | | | | | in MULTI
* | Renamed GetCtxFlags to GetContextFlagsDvir Volk2017-09-273-11/+11
| |
* | Added support for module context flags with RM_GetCtxFlagsDvir Volk2017-09-273-0/+177
| |
* | Clarify comment in change fixing #4323.antirez2017-09-211-2/+6
| |
* | Lazyfree: avoid memory leak when free slowlog entryzhaozhao.zz2017-09-211-2/+5
| |
* | PSYNC2: More refinements related to #4316.psync2-rdb-fixesantirez2017-09-202-11/+14
| |
* | PSYNC2: make persisiting replication info more solidzhaozhao.zz2017-09-204-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a reinforcement of commit c1c99e9. 1. Replication information can be stored when the RDB file is generated by a mater using server.slaveseldb when server.repl_backlog is not NULL, or set repl_stream_db be -1. That's safe, because NULL server.repl_backlog will trigger full synchronization, then master will send SELECT command to replicaiton stream. 2. Only do rdbSave* when rsiptr is not NULL, if we do rdbSave* without rdbSaveInfo, slave will miss repl-stream-db. 3. Save the replication informations also in the case of SAVE command, FLUSHALL command and DEBUG reload.
* | PSYNC2: Fix the way replication info is saved/loaded from RDB.antirez2017-09-194-23/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit attempts to fix a number of bugs reported in #4316. They are related to the way replication info like replication ID, offsets, and currently selected DB in the master client, are stored and loaded by Redis. In order to avoid inconsistencies the changes in this commit try to enforce that: 1. Replication information are only stored when the RDB file is generated by a slave that has a valid 'master' client, so that we can always extract the currently selected DB. 2. When replication informations are persisted in the RDB file, all the info for a successful PSYNC or nothing is persisted. 3. The RDB replication informations are only loaded if the instance is configured as a slave, otherwise a master can start with IDs that relate to a different history of the data set, and stil retain such IDs in the future while receiving unrelated writes.
* | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2017-09-192-3/+2
|\ \
| * \ Merge pull request #3785 from GitHubMota/unstableSalvatore Sanfilippo2017-09-181-2/+2
| |\ \ | | | | | | | | redis-benchmark: default value size usage update.
| | * | redis-benchmark: default value size usage update.Mota2017-07-251-2/+2
| | | | | | | | | | | | | | | | default size of SET/GET value in usage should be 3 bytes as in main code.
| * | | Merge pull request #3554 from jybaek/Delete_duplicateSalvatore Sanfilippo2017-09-181-1/+0
| |\ \ \ | | | | | | | | | | Remove Duplicate Processing
| | * | | Remove Duplicate Processingjybaek2016-10-131-1/+0
| | | | |
* | | | | PSYNC2: Create backlog on slave partial sync as well.antirez2017-09-191-0/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A slave may be started with an RDB file able to provide enough slave to perform a successful partial SYNC with its master. However in such a case, how outlined in issue #4268, the slave backlog will not be started, since it was only initialized on full syncs attempts. This creates different problems with successive PSYNC attempts that will always result in full synchronizations. Thanks to @fdingiit for discovering the issue.
* | | | 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.
* | | | 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 #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
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | 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.
* | | | | | | 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.
View Lorry Controller Status