10352 Commits

Author SHA1 Message Date
Salvatore Sanfilippo
b19e8b9a2c
Merge pull request #5875 from chendq8/partialsync
fix:Slave will do full sync when restart with SHUTDOWN SAVE on cluster mode
2019-03-01 17:29:19 +01:00
Salvatore Sanfilippo
80b8f9febc
Merge pull request #5873 from madolson/dev-unstable-minor-benchmark-precision-fix
Updated redis-benchmark so it doesn't show 1 value above 2ms
2019-03-01 16:55:09 +01:00
Salvatore Sanfilippo
5f2a256ca9
Merge pull request #5881 from artix75/cluster_manager_join_issues
Cluster Manager: create command checks for issues during "CLUSTER MEET"
2019-03-01 16:51:02 +01:00
chendianqiang
a16da79228 optimize cluster failover 2019-03-01 15:28:21 +08:00
John Sully
2cb187ce0a remove unnecessary logs
Former-commit-id: 23f9b584a8e6d082c696b69ff7e1c21e982aae23
2019-02-28 13:57:58 -05:00
artix
6cd64c6a98 Cluster Manager: change join issue message 2019-02-28 16:57:57 +01:00
artix
23ad3faa50 Cluster Manager: change text alert clusterManagerWaitForClusterJoin 2019-02-28 16:57:57 +01:00
artix
2593fb9c0c Cluster Manager: code cleanup 2019-02-28 16:57:57 +01:00
artix
6e9864fe0d Cluster Manager: fix bus error in clusterManagerGetLinkStatus 2019-02-28 16:57:57 +01:00
Artix
121adc604b Cluster Manager: fix memory leaks in clusterManagerGetDisconnectedLinks 2019-02-28 16:57:57 +01:00
artix
b013d2c4db Cluster Manager: fix memory leak in clusterManagerWaitForClusterJoin 2019-02-28 16:57:57 +01:00
artix
3578aabc05 Cluster Manager: improve join issue checking 2019-02-28 16:57:57 +01:00
artix
2f499304aa Cluster Manager: check for unreachable nodes during cluster join. 2019-02-28 16:57:57 +01:00
Salvatore Sanfilippo
9b0b0b3942
Merge pull request #3649 from Alkorin/fixTypo
Fix typo (unsupproted => unsupported) in error message
2019-02-27 22:33:22 +01:00
antirez
74fdfc3763 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2019-02-27 22:21:00 +01:00
antirez
68c75f248e Gopher: reply in gopher mode only if argv[0] starts with slash.
As documented but never implemented.
2019-02-27 22:20:31 +01:00
Salvatore Sanfilippo
88b720672c
Merge pull request #5877 from vattezhang/unstable_sentinel_cmd
fix: fix sentinel command table and new flags format
2019-02-27 15:45:03 +01:00
vattezhang
9d632230b6 fix: fix sentinel command table and new flags format 2019-02-27 21:35:58 +08:00
chendianqiang
8f7e97258b fix replicationid will not change for server.masterhost==NULL in cluster mode when restart slave 2019-02-27 17:43:05 +08:00
chendianqiang
49816941a4
Merge pull request #2 from antirez/unstable
merge from redis
2019-02-27 17:22:08 +08:00
antirez
f311a529be Make PR #5872 more compatible with Redis coding style. 2019-02-27 09:34:50 +01:00
Salvatore Sanfilippo
0dcb003887
Merge pull request #5872 from madolson/dev-unstable-acl-setuser-fix
Updated acl setuser to be all or nothing
2019-02-27 09:31:57 +01:00
Madelyn Olson
b79efef5d6 Updated redis-benchmark so it doesn't show 1 value above 2ms at higher precision 2019-02-26 21:12:55 +00:00
JohnSully
3f7091c075 Update README.md
Former-commit-id: 141557963e8d660072563bcb50c9b110a6e613fe
2019-02-26 15:16:46 -05:00
John Sully
a1c1d381af Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable
Former-commit-id: ffabf3c5b7efa5ec6b654d8d8f5f11a86b39c8cd
2019-02-26 15:14:50 -05:00
John Sully
e0089b390b Thread affinity feature (default disabled)
Former-commit-id: 9b1e95809ce57fea84f30b8d5fb68ee00bd46ceb
2019-02-26 15:14:35 -05:00
JohnSully
d0a4a477b6 Link to detailed benchmarking results and methodology.
Former-commit-id: b8776bb001b90fd550a513612ae89e52ad5985b6
2019-02-26 15:11:25 -05:00
JohnSully
e5b643f41a More fine tuning help. Hopefully we can automate this.
Former-commit-id: 84c20e8337b1598fe4eb57bbb3d8913ae7e77f13
2019-02-26 03:30:37 -05:00
JohnSully
1868d166ee Update benchmarking notes.
Former-commit-id: bae2409cceb26124a346a7e8db40b183952e31f8
2019-02-26 02:30:03 -05:00
John Sully
a23fffc6d2 test code shouldn't be commited
Former-commit-id: 8f7c44257b150856f87367559ae1aef74b15e3a4
2019-02-26 00:21:37 -05:00
John Sully
42afa56f1f Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable
Former-commit-id: 2772ce249cad75b5e9b3bfc57e3b3afe2865a09a
2019-02-26 00:20:11 -05:00
John Sully
9f52d518c3 writes shouldn't be under the global lock
Former-commit-id: bcfd9327cb4fcf5e1fca9477862919817ddc5ab8
2019-02-26 00:19:38 -05:00
John Sully
da1850efa3 Option to disable ASM spinlock
Former-commit-id: 01ff36fc289449d6e0bf20731de079b6957bfac8
2019-02-26 00:00:04 -05:00
Madelyn Olson
075a3b8893 Updated acl setuser to be all or nothing 2019-02-26 02:04:29 +00:00
John Sully
3c9f525f95 Fix build break
Former-commit-id: 6466b09fdc1758b38bbed64b00eb958f5ea36665
2019-02-26 01:10:07 +00:00
John Sully
7a4227915a Rewrite our spinlock in assembly, pretty big performance improvement
Former-commit-id: 40d7a701feefd36e9e3fdb6d516228c4a70fcf3d
2019-02-25 18:21:27 -05:00
antirez
a7780f716e Merge branch 'gopher' into unstable 2019-02-25 18:16:58 +01:00
antirez
40a01a945d Gopher: document the feature in redis.conf. 2019-02-25 17:20:43 +01:00
antirez
21f92e9e34 RESP3: SETNAME option for HELLO. 2019-02-25 16:56:58 +01:00
antirez
d4d15315a8 RESP3: AUTH option for HELLO. 2019-02-25 16:55:16 +01:00
antirez
5748439770 RESP3: refactoring of CLIENT SETNAME to implement SETNAME in HELLO. 2019-02-25 16:51:49 +01:00
antirez
3b420034bb RESP3: allow HELLO to be used with version = 2. 2019-02-25 16:41:00 +01:00
antirez
36d1588215 ACL: authCommand() refactored into ACLAuthenticateUser(). 2019-02-25 16:39:44 +01:00
antirez
87594a7470 ACL: move AUTH implementation in acl.c. 2019-02-25 16:33:38 +01:00
antirez
e247c9ac6a Gopher: don't add the Lastline. 2019-02-24 21:38:15 +01:00
JohnSully
db8cdcafe2 Formatting (more)
Former-commit-id: 78b9d303d3146c9a3121fff4e92f2043c0e50518
2019-02-23 03:08:24 -05:00
John Sully
8994aa2d15 Update copyright to include additional authorship
Former-commit-id: d912013d1bb5aff9cff1c8f3ab06093007de14e3
2019-02-23 02:27:19 -05:00
John Sully
bc89c6e674 Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable
Former-commit-id: 898e6519d12c4bb81a429e3e18ae10340cb4748d
2019-02-23 02:25:00 -05:00
John Sully
44945090fd Merge branch 'Multithread' into unstable
Former-commit-id: 8c074a7d013638e920606d139a6f1c4ff43c6511
2019-02-23 02:24:23 -05:00
John Sully
06d4b7efc3 Support configurable number of threads 2019-02-23 01:51:04 -05:00