7968 Commits

Author SHA1 Message Date
Steve Webster
c652f706cb Only increment delivery count if JUSTID option is omitted 2019-03-12 20:27:53 +00:00
Steve Webster
8fd63c220a 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
e623b4d241 Merge pull request #5902 from zhouyuan/wip_cleanup
server.h: remove dead code
2019-03-08 16:53:20 +01:00
Yuan Zhou
e5149be9de server.h: remove dead code
hashTypeTryObjectEncoding() is not used now
2019-03-07 18:38:27 +08:00
antirez
42ce3e2fd5 ACL: GENPASS subcommand. 2019-03-05 15:51:37 +01:00
antirez
03715f0ead Merge branch 'unstable' of github.com:/antirez/redis into unstable 2019-03-02 21:19:21 +01:00
antirez
f1af6b231f Use the RDB info fields to provide info to users.
Fix #5790 and 5878.

Maybe a better option was to have such fields named with the first
byte '%' as those are info fields for specification, however now to
break it in a backward incompatible way is not an option, so let's use
the fields actively to provide info when sensible, otherwise ignore
when they are not really helpful.
2019-03-02 21:17:42 +01:00
Salvatore Sanfilippo
24cfd01ed8 Merge pull request #5888 from artix75/cluster_backup
Cluster Manager (redis-cli): new "backup" command
2019-03-01 18:43:13 +01:00
Salvatore Sanfilippo
b9bc79f6b5 Merge pull request #5889 from artix75/bm_threads_cluster_dev
Redis benchmark: multithread support and cluster support
2019-03-01 18:39:58 +01:00
artix
ead543dc90 Redis benchmark: update help with threads/cluster options 2019-03-01 18:15:44 +01:00
artix
de6718dbb1 Redis benchmark: fix default hset test key 2019-03-01 17:53:14 +01:00
artix
1b175234f6 Redis Benchmark: update slots configuration after MOVED/ASK reply 2019-03-01 17:53:14 +01:00
artix
7ef83aad5f Redis Benchmark: use atomic var for liveclients in 'createClient' 2019-03-01 17:53:14 +01:00
artix
f33bdf6b64 Redis Benchmark: display 'save' and 'appendonly' configuration 2019-03-01 17:53:14 +01:00
artix
f5ef17ef89 Redis benchmark: add {tag} to all default tests 2019-03-01 17:53:14 +01:00
artix
361a5a2892 Redis benchmark: fixed issued with config.hostip and code cleanup 2019-03-01 17:53:14 +01:00
artix
52ebd2ff18 Redis benchmark: configurable thread count in cluster mode and fixes 2019-03-01 17:53:14 +01:00
artix
c5ddfee4b4 Various changes to redis-benchmark thread and cluster support
- MOVED or ASK replies are now handled in cluster mode.
- Only the first slot per node is used in cluster mode.
- Mutlithreading: reduced usage of mutexes in favor of atomic vars.
2019-03-01 17:53:14 +01:00
artix
c8ca2b328e Redis benchmark: table-based slot hashtag placeholder replacement in cluster mode. 2019-03-01 17:53:14 +01:00
artix
bad4db5525 Added basic support for clusters to redis-benchmark. 2019-03-01 17:53:14 +01:00
artix
60b650be2a Thread support for redis-benchmark. 2019-03-01 17:53:14 +01:00
varianfeng
9514b25a85 fix corrupt_rdb.c bug.Let the name of input rdb file name be valid. 2019-03-01 17:46:42 +01:00
artix
0905d4f67a Cluster Manager backup: remove --cluster-ignore-issue option
Always save the backup, even if there are problems in the cluster.
Just display a warn message and save "cluster_errors" property
inside the json.
2019-03-01 17:41:40 +01:00
artix
620736b81b Cluster Manager: check cluster before backup
- Prevent cluster backup if cluster has issues and needs to be fixed.
  This behaviour can be overridden by adding the option
  '--cluster-ignore-issues'
2019-03-01 17:41:40 +01:00
artix
95a7fb8c9d Cluster Manager: 'backup' command 2019-03-01 17:41:40 +01:00
Salvatore Sanfilippo
85b84a045e 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
c7de202ed6 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
15fb3baa41 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
artix
704e123664 Cluster Manager: change join issue message 2019-02-28 16:57:57 +01:00
artix
5b72ead0ee Cluster Manager: change text alert clusterManagerWaitForClusterJoin 2019-02-28 16:57:57 +01:00
artix
48d7f54aae Cluster Manager: code cleanup 2019-02-28 16:57:57 +01:00
artix
391caf8962 Cluster Manager: fix bus error in clusterManagerGetLinkStatus 2019-02-28 16:57:57 +01:00
Artix
0b6b8553a7 Cluster Manager: fix memory leaks in clusterManagerGetDisconnectedLinks 2019-02-28 16:57:57 +01:00
artix
1269590dd9 Cluster Manager: fix memory leak in clusterManagerWaitForClusterJoin 2019-02-28 16:57:57 +01:00
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
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
chendianqiang
3bb9affb57 Merge pull request #2 from antirez/unstable
merge from redis
2019-02-27 17:22:08 +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
Madelyn Olson
b6b1d56474 Updated acl setuser to be all or nothing 2019-02-26 02:04:29 +00:00
antirez
8b01d81fd4 Merge branch 'gopher' into unstable 2019-02-25 18:16:58 +01:00
antirez
dbdbf19f92 Gopher: document the feature in redis.conf. 2019-02-25 17:20:43 +01:00
antirez
43b7a5fa1c RESP3: SETNAME option for HELLO. 2019-02-25 16:56:58 +01:00