10729 Commits

Author SHA1 Message Date
Steve Webster
dfcb227b50 Only increment delivery count if JUSTID option is omitted 2019-03-12 20:27:53 +00:00
JohnSully
3ea54b608a Update README.md
Former-commit-id: 7546c7d8b41358e4d2a0b71f41ca08b82fa3f8b8
2019-03-12 14:38:03 -04:00
Salvatore Sanfilippo
e5acc5ef4f
Merge pull request #2774 from rouzier/blocking-list-commands-support-milliseconds-floating
Added millisecond resolution for blpop command && friends
2019-03-12 18:10:28 +01:00
Salvatore Sanfilippo
fba6e26e87
Merge pull request #5913 from wurongxin1987/unstable
fix a bufferoverflow bug
2019-03-12 17:25:21 +01:00
Salvatore Sanfilippo
b0bc602bb3
Merge pull request #5900 from artix75/cluster_backup
Cluster Manager: add importing/migrating nodes to backup info
2019-03-12 17:21:17 +01:00
Salvatore Sanfilippo
c02b414e9a
Merge pull request #5903 from soloestoy/sunionstore-lazyfree
try lazyfree temp set in SUNION & SDIFF
2019-03-12 17:20:52 +01:00
Salvatore Sanfilippo
45645aee7f
Merge pull request #5915 from swilly22/redismodule-replicated-cmd-ctx-flag
Extend REDISMODULE_CTX_FLAGS to indicate if command was sent by master
2019-03-12 17:17:19 +01:00
artix
5284d67e37 Redis Benchmark: fix possible usage of freed pointer (getRedisConfig)
Fixes issue #5912
2019-03-12 17:07:23 +01:00
Salvatore Sanfilippo
f63bbb4335
Merge pull request #5920 from chendq8/aofrewrite
remove temp-rewriteaof-xxx.aof when interrupt aofrewrite
2019-03-12 17:03:02 +01:00
vattezhang
bdc783b472 fix: fix the if condition in clusterManagerShowClusterInfo 2019-03-12 22:01:02 +08:00
vattezhang
270a111433 Merge branch 'unstable' of github.com:antirez/redis into unstable 2019-03-12 21:52:20 +08:00
chendianqiang
3621223fbb remove temp-rewriteaof-xxx.aof when interrupt aofrewrite 2019-03-12 20:46:40 +08:00
JohnSully
ec2d1ce822 formatting fixes
Former-commit-id: 703e4ad2fe8bdd05b0655c25a3444f31a4c0d3b6
2019-03-12 00:59:28 -04:00
JohnSully
c017b8370d Add charts to readme
Hotlink from medium, hope they don't mind.

Former-commit-id: 0b98280a1f6a727c5566120b486a9e16aa7dbcc9
2019-03-12 00:55:03 -04:00
John Sully
a4b2ed5861 Merge branch 'unstable' of https://github.com/JohnSully/redis2 into RELEASE_0_9
Former-commit-id: 4609bed6a4ea066d575df740cb2ad617d31fd03a
2019-03-11 20:54:14 -04:00
John Sully
458cb19da3 Werror is good for me, but not for people compiling on other compilers
Former-commit-id: 99ccb11d89c049e467ed552709d9cd3674561e8c
2019-03-11 20:53:57 -04:00
JohnSully
95150e9108 Explain how multithreading works
Former-commit-id: 8a5a513662d1eaeaf9887584a415d5e1bca06681
2019-03-11 20:37:57 -04:00
JohnSully
e60f381366 Update README.md
Former-commit-id: bf0fd22309ad3992f10316a9f3c12916db78c1bb
2019-03-11 19:38:20 -04:00
swilly22
468860ae18 Extend REDISMODULE_CTX_FLAGS to indicate if command was sent by master 2019-03-11 10:02:19 +02:00
antirez
8a46d32be2 Make comment in #5911 stay inside 80 cols. 2019-03-10 09:48:06 +01:00
Salvatore Sanfilippo
55acac04b4
Merge pull request #5911 from JohnSully/unstable
Replicas aren't allowed to run the replicaof command
2019-03-10 09:45:55 +01:00
wurongxin
0298d3ad18 fix a bufferoverflow bug 2019-03-10 15:30:32 +08:00
John Sully
3c4a69fe36 Make storage.h C++ safe
Former-commit-id: cc98d10fc695dd61b1ef5d96ac2866a877111e50
2019-03-09 13:42:08 -05:00
John Sully
6ef744f242 sizeof is too big
Former-commit-id: a6a022faa228fd67deeb1767c10ed7f184c28c29
2019-03-09 13:41:49 -05:00
John Sully
5b52bc738b Replicas aren't allowed to run the replicaof command 2019-03-09 11:04:48 -05:00
Brad Solomon
79660e4ff4 Note that install_server.sh is not for Mac OSX
It will fail pretty quickly since there is no -f
readlink flag there.
2019-03-09 10:21:15 -05:00
Steve Webster
f1e7df4b7c Increment delivery counter on XCLAIM unless RETRYCOUNT specified
The XCLAIM docs state the XCLAIM increments the delivery counter for
messages. This PR makes the code match the documentation - which seems
like the desired behaviour - whilst still allowing RETRYCOUNT to be
specified manually.

My understanding of the way streamPropagateXCLAIM() works is that this
change will safely propagate to replicas since retry count is pulled
directly from the streamNACK struct.

Fixes #5194
2019-03-08 17:09:11 +00:00
Salvatore Sanfilippo
0f03312c23
Merge pull request #5902 from zhouyuan/wip_cleanup
server.h: remove dead code
2019-03-08 16:53:20 +01:00
artix
8fadebfcca Redis Benchmark: handle CLUSTERDOWN error 2019-03-08 11:05:02 +01:00
John Sully
e23a80277f bump version
Former-commit-id: a864ad1c9c6bf25f2224499bec8b49f1bdb5eab0
2019-03-07 19:13:59 -05:00
John Sully
7408646c8a Merge branch 'unstable' into RELEASE_0_9
Former-commit-id: 0bc586933ff91fd07128d5419b06303f05d16f2e
2019-03-07 19:13:33 -05:00
John Sully
02b030bc8c Module threading fixes
Former-commit-id: 2785a8b4d40b09caea5e209ab49fc5f1484981a8
2019-03-07 19:13:01 -05:00
zhaozhao.zz
0137f1a2e3 try lazyfree temp set in SUNION & SDIFF 2019-03-07 22:08:04 +08:00
Yuan Zhou
feb4ebff45 server.h: remove dead code
hashTypeTryObjectEncoding() is not used now
2019-03-07 18:38:27 +08:00
artix
c389ad0d52 Redis Benchmark: fix key randomization with zero keyspacelen 2019-03-07 11:30:09 +01:00
artix
0e963e068d Redis Benchmark: add multithread idle mode
Fix issue #5891
2019-03-07 11:14:07 +01:00
Brad Solomon
d5b24d31d7 Provide an uninstall target in Makefile
On `make uninstall`, removes:

- /usr/local/bin/redis-benchmark
- /usr/local/bin/redis-check-aof
- /usr/local/bin/redis-check-rdb
- /usr/local/bin/redis-cli
- /usr/local/bin/redis-sentinel
- /usr/local/bin/redis-server

(Only the src/ versions are removed in `make clean`)
2019-03-06 21:24:45 -05:00
John Sully
5176c0440e Merge branch 'unstable' into RELEASE_0_9
Former-commit-id: d5d5f6ae06c9608b8edf3ea28a518779846a8802
2019-03-06 16:39:15 -05:00
John Sully
d94984f96c Limit server-threads to cores in the machine
Former-commit-id: be3ba1d53eb070719fd84c7573f665277a35b6f4
2019-03-06 16:39:02 -05:00
John Sully
6add662139 port server.c to server.cpp
Former-commit-id: 09e6a4fee09b1a61e6d2ac83a2c8fec9978474ec
2019-03-06 16:29:30 -05:00
John Sully
5dd3621d2c Set version
Former-commit-id: efc60dd8c5304f2a7cf072ab3c430c0feb886033
2019-03-06 15:25:28 -05:00
John Sully
d487df2caf Don't send replies to slaves after we've queued them to be closed
Former-commit-id: a52cd974b90cdf00b7f10525e754755ca5428dbb
2019-03-06 15:21:05 -05:00
artix
93e51239ce Cluster Manager: add importing/migrating nodes to backup info 2019-03-06 16:38:36 +01:00
John Sully
26c97eafe2 defer free
Former-commit-id: de4217489c87cd8347ecdb7f4df5c3b7615330d6
2019-03-05 15:46:19 -05:00
antirez
c33cb4938a ACL: GENPASS subcommand. 2019-03-05 15:51:37 +01:00
zhaozhao.zz
fb81d1b3f8 Fix compile warning when log aux field 2019-03-04 19:43:00 +08:00
John Sully
af06ffa43a Fix crash with paused clients (accessed when global lock is not acquired)
Former-commit-id: 3c658b5012ed20f502976706e657cd2fa05e246c
2019-03-03 22:24:12 -05:00
Itamar Haber
cd2743c0e6 Fixes BZ[REV]POP's arity 2019-03-03 23:10:45 +02:00
John Sully
5b557d3989 Crash in Memory Doctor when all clients are slaves
Former-commit-id: f6814aa82564ad1b095edefeda9541859cbbb804
2019-03-03 13:56:47 -05:00
John Sully
2509750fc7 Fix issue #2, check posix return values
Former-commit-id: 01a529cbda919d5514a4a445b26a0408115173ca
2019-03-02 20:43:03 -05:00