6678 Commits

Author SHA1 Message Date
artix
d1aabe177a Cluster Manager: improve join issue checking 2019-02-28 16:57:57 +01:00
artix
b4a800b61e Cluster Manager: check for unreachable nodes during cluster join. 2019-02-28 16:57:57 +01:00
Salvatore Sanfilippo
f8322797b2 Merge pull request #3649 from Alkorin/fixTypo
Fix typo (unsupproted => unsupported) in error message
2019-02-27 22:33:22 +01:00
antirez
fc6675c901 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2019-02-27 22:21:00 +01:00
antirez
2fd9b52b42 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
e2a7df2d6c 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
034741f7e8 fix: fix sentinel command table and new flags format 2019-02-27 21:35:58 +08:00
vattezhang
f66aed6598 fix: fix sentinel command table and new flags format 2019-02-27 21:20:00 +08:00
chendianqiang
4cf2552bd3 fix replicationid will not change for server.masterhost==NULL in cluster mode when restart slave 2019-02-27 17:43:05 +08:00
antirez
2136c71a88 Make PR #5872 more compatible with Redis coding style. 2019-02-27 09:34:50 +01:00
Salvatore Sanfilippo
407c5942b8 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
8e20c1f854 Updated redis-benchmark so it doesn't show 1 value above 2ms at higher precision 2019-02-26 21:12:55 +00:00
John Sully
8db15e9666 Thread affinity feature (default disabled)
Former-commit-id: 9b1e95809ce57fea84f30b8d5fb68ee00bd46ceb
2019-02-26 15:14:35 -05:00
John Sully
f474419764 test code shouldn't be commited
Former-commit-id: 8f7c44257b150856f87367559ae1aef74b15e3a4
2019-02-26 00:21:37 -05:00
John Sully
16f5a47c5f 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
be82e98799 writes shouldn't be under the global lock
Former-commit-id: bcfd9327cb4fcf5e1fca9477862919817ddc5ab8
2019-02-26 00:19:38 -05:00
John Sully
f019a3b69e Option to disable ASM spinlock
Former-commit-id: 01ff36fc289449d6e0bf20731de079b6957bfac8
2019-02-26 00:00:04 -05:00
Madelyn Olson
b6b1d56474 Updated acl setuser to be all or nothing 2019-02-26 02:04:29 +00:00
John Sully
3ca6b6f9a2 Fix build break
Former-commit-id: 6466b09fdc1758b38bbed64b00eb958f5ea36665
2019-02-26 01:10:07 +00:00
John Sully
f446785084 Rewrite our spinlock in assembly, pretty big performance improvement
Former-commit-id: 40d7a701feefd36e9e3fdb6d516228c4a70fcf3d
2019-02-25 18:21:27 -05:00
antirez
8b01d81fd4 Merge branch 'gopher' into unstable 2019-02-25 18:16:58 +01:00
antirez
43b7a5fa1c RESP3: SETNAME option for HELLO. 2019-02-25 16:56:58 +01:00
antirez
ea75d7d52b RESP3: AUTH option for HELLO. 2019-02-25 16:55:16 +01:00
antirez
17e9ec2a69 RESP3: refactoring of CLIENT SETNAME to implement SETNAME in HELLO. 2019-02-25 16:51:49 +01:00
antirez
505815da4b RESP3: allow HELLO to be used with version = 2. 2019-02-25 16:41:00 +01:00
antirez
79209f1367 ACL: authCommand() refactored into ACLAuthenticateUser(). 2019-02-25 16:39:44 +01:00
antirez
dec44d23d3 ACL: move AUTH implementation in acl.c. 2019-02-25 16:33:38 +01:00
antirez
4eeaa8bcf3 Gopher: don't add the Lastline. 2019-02-24 21:38:15 +01:00
John Sully
677391bd77 Merge branch 'Multithread' into unstable
Former-commit-id: 8c074a7d013638e920606d139a6f1c4ff43c6511
2019-02-23 02:24:23 -05:00
John Sully
f97f602f77 Support configurable number of threads 2019-02-23 01:51:04 -05:00
John Sully
84f38452e5 Support a non-spinlock mutex if compiled in 2019-02-23 01:50:02 -05:00
John Sully
554012085c All tests pass single thread 2019-02-23 00:09:34 -05:00
John Sully
cfabd4f666 Fix failure to trim querybuf (and memory tests that fail because of it) 2019-02-22 22:09:25 -05:00
John Sully
906308d728 Fix EMBSTR corruption 2019-02-22 21:32:43 -05:00
John Sully
131518da62 Missing file from merge 2019-02-22 21:16:50 -05:00
John Sully
08723fc9d4 Disable RTTI, we don't need it 2019-02-22 21:16:27 -05:00
John Sully
5539e7522a Merge branch 'unstable' of https://github.com/antirez/redis into Multithread 2019-02-22 21:16:10 -05:00
John Sully
dbd82f6bfc Lock use after free 2019-02-22 21:00:14 -05:00
John Sully
174e9fe809 fix corruption in object size optimization 2019-02-22 17:45:50 -05:00
John Sully
6c6d913a86 Remove unnecessary mfences 2019-02-22 15:49:22 -05:00
antirez
73ae256e3f ACL: fix ACLSaveToFile() return value. 2019-02-22 12:45:13 +01:00
antirez
fde40f1050 ACL: less error prone error handling in ACLSaveToFile(). 2019-02-22 12:43:08 +01:00
antirez
7316f22c8f Gopher: TODO list. 2019-02-22 11:17:39 +01:00
Salvatore Sanfilippo
62fe3057c5 Merge pull request #5850 from artix75/dev
Cluster Manager: fix replica assignment anti-affinity (create)
2019-02-22 10:28:31 +01:00
Salvatore Sanfilippo
3994e59268 Merge pull request #5858 from madolson/dev-unstable-acl-deluser
Making deleting users better defined and update documentation
2019-02-22 10:27:37 +01:00
Salvatore Sanfilippo
4da6d258e8 Merge pull request #5859 from madolson/dev-unstable-networking-cleanup
Refactored manual computation of object length
2019-02-22 10:25:17 +01:00
antirez
861c035265 Gopher: basic serving of string type. 2019-02-22 10:21:24 +01:00
John Sully
30e8a859c0 Prevent mixed up client replies, and deadlocks 2019-02-22 01:24:16 -05:00
John Sully
2788cf57b0 Implement try_lock 2019-02-22 01:23:31 -05:00
John Sully
8cd2cdca3d Merge branch 'unstable' of https://github.com/antirez/redis into Multithread 2019-02-21 18:17:12 -05:00