summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* PSYNC2: meaningful offset test.meaningful-offsetantirez2020-03-252-0/+62
|
* PSYNC2: meaningful offset implemented.antirez2020-03-253-1/+40
| | | | | | | | | | | | | | | | | | | | | | A very commonly signaled operational problem with Redis master-replicas sets is that, once the master becomes unavailable for some reason, especially because of network problems, many times it wont be able to perform a partial resynchronization with the new master, once it rejoins the partition, for the following reason: 1. The master becomes isolated, however it keeps sending PINGs to the replicas. Such PINGs will never be received since the link connection is actually already severed. 2. On the other side, one of the replicas will turn into the new master, setting its secondary replication ID offset to the one of the last command received from the old master: this offset will not include the PINGs sent by the master once the link was already disconnected. 3. When the master rejoins the partion and is turned into a replica, its offset will be too advanced because of the PINGs, so a PSYNC will fail, and a full synchronization will be required. Related to issue #7002 and other discussion we had in the past around this problem.
* Explain why we allow transactions in -BUSY state.antirez2020-03-251-2/+9
| | | | Related to #7022.
* Merge pull request #7022 from oranagra/multi-busy-scriptSalvatore Sanfilippo2020-03-252-0/+73
|\ | | | | MULTI/EXEC during LUA script timeout are messed up
| * MULTI/EXEC during LUA script timeout are messed upOran Agra2020-03-232-0/+73
|/ | | | | | | | | | | | | | | | | Redis refusing to run MULTI or EXEC during script timeout may cause partial transactions to run. 1) if the client sends MULTI+commands+EXEC in pipeline without waiting for response, but these arrive to the shards partially while there's a busy script, and partially after it eventually finishes: we'll end up running only part of the transaction (since multi was ignored, and exec would fail). 2) similar to the above if EXEC arrives during busy script, it'll be ignored and the client state remains in a transaction. the 3rd test which i added for a case where MULTI and EXEC are ok, and only the body arrives during busy script was already handled correctly since processCommand calls flagTransaction
* Improve comments of replicationCacheMasterUsingMyself().antirez2020-03-231-1/+6
|
* Fix BITFIELD_RO test.antirez2020-03-232-5/+5
|
* Abort transactions after -READONLY error. Fix #7014.antirez2020-03-231-0/+1
|
* Minor changes to BITFIELD_RO PR #6951.antirez2020-03-231-6/+9
|
* Merge pull request #6951 from yangbodong22011/feature-bitfield-roSalvatore Sanfilippo2020-03-234-1/+54
|\ | | | | Added BITFIELD_RO variants for read-only operations.
| * Added BITFIELD_RO variants for read-only operations.bodong.ybd2020-03-044-1/+54
| |
* | Modules: updated function doc after #7003.antirez2020-03-231-1/+6
| |
* | Merge pull request #7003 from guybe7/rm_context_flags_handle_nullSalvatore Sanfilippo2020-03-231-14/+16
|\ \ | | | | | | Allow RM_GetContextFlags to work with ctx==NULL
| * | Allow RM_GetContextFlags to work with ctx==NULLGuy Benoish2020-03-181-14/+16
| |/
* | Merge pull request #7005 from hwware/memoryleakfix-redis-cliSalvatore Sanfilippo2020-03-231-0/+2
|\ \ | | | | | | fix potential memory leak in redis-cli lua debug mode
| * | fix potentical memory leak in redis-clihwware2020-03-181-0/+2
| | |
* | | Merge pull request #7018 from yossigo/fix-accept-issuesSalvatore Sanfilippo2020-03-235-40/+58
|\ \ \ | | | | | | | | Fix issues with failed/rejected accepts.
| * | | Fix crashes related to failed/rejected accepts.Yossi Gottlieb2020-03-221-5/+6
| | | |
| * | | Cluster: fix misleading accept errors.Yossi Gottlieb2020-03-221-3/+4
| | | |
| * | | Conns: Fix connClose() / connAccept() behavior.Yossi Gottlieb2020-03-223-32/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We assume accept handlers may choose to reject a connection and close it, but connAccept() callers can't distinguish between this state and other error states requiring connClose(). This makes it safe (and mandatory!) to always call connClose() if connAccept() fails, and safe for accept handlers to close connections (which will defer).
* | | | Merge pull request #7019 from hwware/cscfixSalvatore Sanfilippo2020-03-231-2/+2
|\ \ \ \ | |/ / / |/| | | Fix Bug for Client Side Caching: Unexpected Behaviour when Switching between OPTIN/OPTOUT Mode
| * | | remove redundant Semicolonhwware2020-03-231-1/+1
| | | |
| * | | clean CLIENT_TRACKING_CACHING flag when disabled cachinghwware2020-03-231-1/+1
| | | |
* | | | Merge pull request #7013 from hwware/clusterhelpfixSalvatore Sanfilippo2020-03-201-1/+2
|\ \ \ \ | | | | | | | | | | add missing commands description in cluster help
| * | | | add missing commands in cluster helphwware2020-03-201-1/+2
| |/ / /
* | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-03-206-4/+102
|\ \ \ \ | |/ / /
| * | | Merge pull request #6996 from artix75/redis_cli_proxy_infoSalvatore Sanfilippo2020-03-181-1/+5
| |\ \ \ | | | | | | | | | | Support Redis Cluster Proxy PROXY INFO command
| | * | | Support Redis Cluster Proxy PROXY INFO commandartix2020-03-161-1/+5
| | | | |
| * | | | Merge pull request #7000 from ppillip/patch-1Salvatore Sanfilippo2020-03-181-1/+1
| |\ \ \ \ | | | | | | | | | | | | Update redis.conf
| | * | | | Update redis.conf박승현2020-03-181-1/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #7001 from trevor211/fixDataInconsistencySalvatore Sanfilippo2020-03-184-2/+96
| |\ \ \ \ | | |/ / / | |/| | | Fix data inconsistency
| | * | | Fix master replica inconsistency for upgrading scenario.WuYunlong2020-03-183-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, when upgrading a replica, expired keys will not be loaded, thus causing replica having less keys in db. To this point, master and replica's keys is logically consistent. However, before the keys in master and replica are physically consistent, that is, they have the same dbsize, if master got a problem and the replica got promoted and becomes new master of that partition, and master updates a key which does not exist on master, but physically exists on the old master(new replica), the old master would refuse to update the key, thus causing master and replica data inconsistent. How could this happen? That's all because of the wrong judgement of roles while starting up the server. We can not use server.masterhost to judge if the server is master or replica, since it fails in cluster mode. When we start the server, we load rdb and do want to load expired keys, and do not want to have the ability to active expire keys, if it is a replica.
| | * | | Add 14-consistency-check.tcl to prove there is a data consistency issue.WuYunlong2020-03-181-0/+87
| |/ / /
* | | | Regression test for #7011.antirez2020-03-201-0/+7
| | | |
* | | | ACL: default user off should not allow automatic authentication.antirez2020-03-202-2/+3
|/ / / | | | | | | | | | This fixes issue #7011.
* | | Sentinel: document auth-user directive.antirez2020-03-161-0/+12
| | |
* | | ACL: Make Redis 6 more backward compatible with requirepass.antirez2020-03-164-15/+17
| | | | | | | | | | | | Note that this as a side effect fixes Sentinel "requirepass" mode.
* | | Sentinel: implement auth-user directive for ACLs.antirez2020-03-161-7/+38
|/ /
* | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-03-162-6/+14
|\ \
| * \ Merge pull request #6991 from soloestoy/io-threads-bugfixSalvatore Sanfilippo2020-03-161-5/+11
| |\ \ | | | | | | | | Threaded IO: bugfix client kill may crash redis
| | * | Threaded IO: bugfix client kill may crash rediszhaozhao.zz2020-03-151-5/+11
| | | |
| * | | Merge pull request #6993 from soloestoy/optimize-threaded-ioSalvatore Sanfilippo2020-03-161-1/+3
| |\ \ \ | | | | | | | | | | Threaded IO: handle pending reads clients ASAP after event loop
| | * | | Threaded IO: handle pending reads clients ASAP after event loopzhaozhao.zz2020-03-161-1/+3
| | | | |
* | | | | Example sentinel conf: document requirepass.antirez2020-03-161-0/+8
|/ / / /
* | | | Aesthetic changes in PR #6989.antirez2020-03-151-5/+9
| | | |
* | | | Merge pull request #6989 from soloestoy/io-threads-bugfixSalvatore Sanfilippo2020-03-151-0/+5
|\ \ \ \ | |/ / / |/| / / | |/ / Threaded IO: bugfix #6988 process events while blocked
| * | Threaded IO: bugfix #6988 process events while blockedzhaozhao.zz2020-03-151-0/+5
|/ /
* | Restore newline at the end of redis-cli.cantirez2020-03-131-1/+2
| |
* | Merge pull request #6918 from chendq8/fixModuleUnregisterUsedApiSalvatore Sanfilippo2020-03-131-1/+1
|\ \ | | | | | | Fix module unregister used api
| * | use correct list for moduleUnregisterUsedAPIchendianqiang2020-02-221-1/+1
| | |