7984 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Salvatore Sanfilippo	02dab20026	Merge pull request #5894 from soloestoy/fix-rdb-warning ... Fix compile some warnings	2019-03-13 11:47:48 +01:00
zhaozhao.zz	5a3d3d8be4	Fix compile warning in redis-cli.c	2019-03-13 16:54:34 +08: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
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
chendianqiang	3621223fbb	remove temp-rewriteaof-xxx.aof when interrupt aofrewrite	2019-03-12 20:46:40 +08: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	5b52bc738b	Replicas aren't allowed to run the replicaof command	2019-03-09 11:04:48 -05: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
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	93e51239ce	Cluster Manager: add importing/migrating nodes to backup info	2019-03-06 16:38:36 +01: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
antirez	4edb1d7e10	Merge branch 'unstable' of github.com:/antirez/redis into unstable	2019-03-02 21:19:21 +01:00
antirez	b9b140e2e2	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	56cf413844	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	537d859288	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	cb1be1ca81	Redis benchmark: update help with threads/cluster options	2019-03-01 18:15:44 +01:00
artix	a79b84ab7f	Redis benchmark: fix default hset test key	2019-03-01 17:53:14 +01:00
artix	4e78d5cd40	Redis Benchmark: update slots configuration after MOVED/ASK reply	2019-03-01 17:53:14 +01:00
artix	daaff484a6	Redis Benchmark: use atomic var for liveclients in 'createClient'	2019-03-01 17:53:14 +01:00
artix	834809cbb3	Redis Benchmark: display 'save' and 'appendonly' configuration	2019-03-01 17:53:14 +01:00
artix	649c947a0f	Redis benchmark: add {tag} to all default tests	2019-03-01 17:53:14 +01:00
artix	eb8b4feef7	Redis benchmark: fixed issued with config.hostip and code cleanup	2019-03-01 17:53:14 +01:00
artix	f95e01266e	Redis benchmark: configurable thread count in cluster mode and fixes	2019-03-01 17:53:14 +01:00
artix	5fd5799cf9	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	434f761304	Redis benchmark: table-based slot hashtag placeholder replacement in cluster mode.	2019-03-01 17:53:14 +01:00
artix	dfd3cc5f78	Added basic support for clusters to redis-benchmark.	2019-03-01 17:53:14 +01:00
artix	563885d6d9	Thread support for redis-benchmark.	2019-03-01 17:53:14 +01:00
varianfeng	ab1e87f5b1	fix corrupt_rdb.c bug.Let the name of input rdb file name be valid.	2019-03-01 17:46:42 +01:00
artix	e6156a39bd	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	5e4dfc5c97	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	fb020ab090	Cluster Manager: 'backup' command	2019-03-01 17:41:40 +01:00
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
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