gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,157 Commits 1 Branch 0 Tags
Commit Graph

15157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hwware
93bb42a0b5 add missing commands in cluster help 2020-03-20 09:01:12 -04:00
antirez
1e16b9384d Merge branch 'unstable' of github.com:/antirez/redis into unstable 2020-03-20 13:21:28 +01:00
antirez
5497a44037 Regression test for #7011. 2020-03-20 12:52:06 +01:00
antirez
f9c56dbb09 ACL: default user off should not allow automatic authentication. 
This fixes issue #7011.
 2020-03-20 12:45:48 +01:00
John Sully
b057a9cd7a Unstable branch should always be version 0.0.0 
Former-commit-id: 448808529ab9e9e4705c2e7cbda5b3e6523b7c6f
 2020-03-19 15:52:24 -04:00
John Sully
dada212214 Merge branch 'RELEASE_5' into unstable 
Former-commit-id: a0bc2084128f991697d3e1b7473d14c55afdd785
 2020-03-19 15:38:16 -04:00
John Sully
69806aaa7b Print stack traces of other threads in the deadlock detector 
Former-commit-id: 6b0172b9bf124372f4c8688c91c380c6c1b607c7
 2020-03-19 15:37:49 -04:00
John Sully
1bdccb3c42 Log which thread a message came from 
Former-commit-id: bc1eccb66d3302d6c99588fb4a5a879e1ef243b1
 2020-03-19 15:37:24 -04:00
John Sully
4d5d7ed59f Fix lock inversion in processEventsWhileBlocked 
Former-commit-id: a9249d4a82a0f0355ac8ffa40b34b9c14cabf66b
 2020-03-19 15:28:39 -04:00
John Sully
87626299a6 Prevent dangling lock when we can't free the client 
Former-commit-id: 3c373494d63b21744b264f0a47e6999bcdda6b2b
 2020-03-19 14:34:23 -04:00
hwware
262262fbb2 fix spelling in cluster.c 2020-03-18 09:48:03 -04:00
hwware
86691ccff5 fix potentical memory leak in redis-cli 2020-03-18 09:33:52 -04:00
Guy Benoish
f16eaadd4f Allow RM_GetContextFlags to work with ctx==NULL 2020-03-18 18:34:27 +05:30
Salvatore Sanfilippo
c1295bb9f1
Merge pull request #6996 from artix75/redis_cli_proxy_info 
Support Redis Cluster Proxy PROXY INFO command
 2020-03-18 11:06:49 +01:00
Salvatore Sanfilippo
c52415b219
Merge pull request #7000 from ppillip/patch-1 
Update redis.conf
 2020-03-18 11:06:22 +01:00
Salvatore Sanfilippo
82e1807769
Merge pull request #7001 from trevor211/fixDataInconsistency 
Fix data inconsistency
 2020-03-18 11:04:08 +01:00
WuYunlong
f6029fb925 Fix master replica inconsistency for upgrading scenario. 
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.
 2020-03-18 16:22:07 +08:00
WuYunlong
af5167b7f3 Add 14-consistency-check.tcl to prove there is a data consistency issue. 2020-03-18 16:17:46 +08:00
박승현
d9de9d5478
Update redis.conf 2020-03-18 14:40:50 +09:00
John Sully
19cee3b2a7 Merge branch 'PRO_RELEASE_6' of https://github.com/JohnSully/KeyDB-Pro into PRO_RELEASE_6 
Former-commit-id: 1c1f3c920411ee94eb8b81922189b98c9631b3de
 2020-03-17 17:48:27 -04:00
John Sully
598f17f4cc Merge branch 'keydbpro' into PRO_RELEASE_6 
Former-commit-id: 23c3316c10f2771bc26e50698b48934ec7549bcd
 2020-03-17 17:47:55 -04:00
John Sully
682d16b7d3 Special case version 0.0.0 which is equal to any version 
Former-commit-id: 869d037490b6905674f75a8552898aed72148558
 2020-03-17 17:25:36 -04:00
John Sully
b2a313e0c1 Merge branch 'keydbpro' into PRO_RELEASE_6 
Former-commit-id: dd8339da10c17f0e2f238310a10e97395f8f12ac
 2020-03-17 17:11:51 -04:00
John Sully
ebe0b918bc Cache count of keys in database 
Former-commit-id: 7cd266030ad82b5fddd4668d666adc95e1bed475
 2020-03-17 17:11:41 -04:00
John Sully
9edd2d2ae4 Merge branch 'redis_6_merge' into keydbpro 
Former-commit-id: ff3190cac5c5d222904aa2d57d97c752c1b7e554
 2020-03-17 00:10:09 -04:00
John Sully
3df47fa3ab Merge branch 'unstable' into redis_6_merge 
Former-commit-id: 40761e403166bf3342fe388ab742498f99245b1a
 2020-03-17 00:09:48 -04:00
John Sully
42027c533a Fix issue #153: Config get replicaof returns a corrupt response 
Former-commit-id: 5aef606d3bc1d748ca8d2df1d36feccaa2e583c0
 2020-03-16 20:43:46 -04:00
antirez
b3a97004f4 Sentinel: document auth-user directive. 2020-03-16 17:11:43 +01:00
antirez
29b9d0a245 ACL: Make Redis 6 more backward compatible with requirepass. 
Note that this as a side effect fixes Sentinel "requirepass" mode.
 2020-03-16 16:57:12 +01:00
artix
771df8a436 Support Redis Cluster Proxy PROXY INFO command 2020-03-16 16:15:02 +01:00
antirez
9321c7871f Sentinel: implement auth-user directive for ACLs. 2020-03-16 15:59:34 +01:00
antirez
bce9a68b39 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2020-03-16 13:48:35 +01:00
antirez
8609e68161 Example sentinel conf: document requirepass. 2020-03-16 13:48:29 +01:00
Salvatore Sanfilippo
15338ab694
Merge pull request #6991 from soloestoy/io-threads-bugfix 
Threaded IO: bugfix client kill may crash redis
 2020-03-16 10:53:54 +01:00
Salvatore Sanfilippo
f1e4af2c29
Merge pull request #6993 from soloestoy/optimize-threaded-io 
Threaded IO: handle pending reads clients ASAP after event loop
 2020-03-16 10:48:23 +01:00
zhaozhao.zz
c46c76a399 Threaded IO: handle pending reads clients ASAP after event loop 2020-03-16 11:20:48 +08:00
John Sully
41249c28ff Merge branch 'redis_6_merge' into keydbpro 
Former-commit-id: aea8413a15001e2c27cf03dd41fa15151b0d3ccb
 2020-03-15 18:48:45 -04:00
John Sully
c7f1eab8a4 Merge branch 'unstable' into redis_6_merge 
Former-commit-id: 4671cd6002c50dd8484e59fd7434878053340702
 2020-03-15 18:47:27 -04:00
John Sully
15df3ed91d Handle HTTP error codes with MOTD 
Former-commit-id: 2ec0b2cd206f2c73fabcda5d59751b013aa8cfbf
 2020-03-15 18:47:01 -04:00
John Sully
34fca59d4a Update MOTD url for Pro 
Former-commit-id: feed518042f3046016c26beda1c08cc721914943
 2020-03-15 18:34:42 -04:00
John Sully
52bd8f19a5 Merge branch 'redis_6_merge' into keydbpro 
Former-commit-id: 2765895981196adf6a8300eb4a704d60ec651f56
 2020-03-15 18:34:15 -04:00
John Sully
d73ac7e377 Merge branch 'unstable' into redis_6_merge 
Former-commit-id: 07effa392564f3c53989600e803103f3e3951fe7
 2020-03-15 18:33:24 -04:00
John Sully
3b1f36a521 Update MOTD URL 
Former-commit-id: cd76a71de393eb527f98024ea85a9492ef0c36ca
 2020-03-15 18:32:05 -04:00
John Sully
4aa8591355 Merge branch 'keydbpro' of https://github.com/JohnSully/KeyDB-Pro into keydbpro 
Former-commit-id: c70edb09d33b746fa6893488327f301aff455b58
 2020-03-15 18:28:00 -04:00
John Sully
006a9565d3 Add fallback if we fail to evict normally with FLASH (flush everything) 
Former-commit-id: 66ee85a8d5e24514083aa3478dcf0cf3da86520e
 2020-03-15 18:27:10 -04:00
John Sully
282dd54eb6 Change the default for maxmemory samples to 10 to reduce issues with FLASH storage and eviction failure 
Former-commit-id: 8571d8aca9b462d600b78854c0795c8b33520088
 2020-03-15 18:26:46 -04:00
zhaozhao.zz
a6a0e05a1a Threaded IO: bugfix client kill may crash redis 2020-03-15 23:30:25 +08:00
antirez
573c4673ee Aesthetic changes in PR #6989. 2020-03-15 16:10:37 +01:00
Salvatore Sanfilippo
681c6f21b7
Merge pull request #6989 from soloestoy/io-threads-bugfix 
Threaded IO: bugfix #6988 process events while blocked
 2020-03-15 15:57:22 +01:00
zhaozhao.zz
606a01df70 Threaded IO: bugfix #6988 process events while blocked 2020-03-15 22:07:36 +08:00