9413 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
hwware	93bb42a0b5	add missing commands in cluster help	2020-03-20 09:01:12 -04:00
antirez	1e16b9384d	Merge branch 'unstable' of github.com:/antirez/redis into unstable	2020-03-20 13:21:28 +01:00
antirez	5497a44037	Regression test for #7011.	2020-03-20 12:52:06 +01:00
antirez	f9c56dbb09	ACL: default user off should not allow automatic authentication. ... This fixes issue #7011.	2020-03-20 12:45:48 +01:00
hwware	262262fbb2	fix spelling in cluster.c	2020-03-18 09:48:03 -04:00
hwware	86691ccff5	fix potentical memory leak in redis-cli	2020-03-18 09:33:52 -04:00
Guy Benoish	f16eaadd4f	Allow RM_GetContextFlags to work with ctx==NULL	2020-03-18 18:34:27 +05:30
Salvatore Sanfilippo	c1295bb9f1	Merge pull request #6996 from artix75/redis_cli_proxy_info ... Support Redis Cluster Proxy PROXY INFO command	2020-03-18 11:06:49 +01:00
Salvatore Sanfilippo	c52415b219	Merge pull request #7000 from ppillip/patch-1 ... Update redis.conf	2020-03-18 11:06:22 +01:00
Salvatore Sanfilippo	82e1807769	Merge pull request #7001 from trevor211/fixDataInconsistency ... Fix data inconsistency	2020-03-18 11:04:08 +01:00
WuYunlong	f6029fb925	Fix master replica inconsistency for upgrading scenario. ... Before this commit, when upgrading a replica, expired keys will not be loaded, thus causing replica having less keys in db. To this point, master and replica's keys is logically consistent. However, before the keys in master and replica are physically consistent, that is, they have the same dbsize, if master got a problem and the replica got promoted and becomes new master of that partition, and master updates a key which does not exist on master, but physically exists on the old master(new replica), the old master would refuse to update the key, thus causing master and replica data inconsistent. How could this happen? That's all because of the wrong judgement of roles while starting up the server. We can not use server.masterhost to judge if the server is master or replica, since it fails in cluster mode. When we start the server, we load rdb and do want to load expired keys, and do not want to have the ability to active expire keys, if it is a replica.	2020-03-18 16:22:07 +08:00
WuYunlong	af5167b7f3	Add 14-consistency-check.tcl to prove there is a data consistency issue.	2020-03-18 16:17:46 +08:00
박승현	d9de9d5478	Update redis.conf	2020-03-18 14:40:50 +09:00
antirez	b3a97004f4	Sentinel: document auth-user directive.	2020-03-16 17:11:43 +01:00
antirez	29b9d0a245	ACL: Make Redis 6 more backward compatible with requirepass. ... Note that this as a side effect fixes Sentinel "requirepass" mode.	2020-03-16 16:57:12 +01:00
artix	771df8a436	Support Redis Cluster Proxy PROXY INFO command	2020-03-16 16:15:02 +01:00
antirez	9321c7871f	Sentinel: implement auth-user directive for ACLs.	2020-03-16 15:59:34 +01:00
antirez	bce9a68b39	Merge branch 'unstable' of github.com:/antirez/redis into unstable	2020-03-16 13:48:35 +01:00
antirez	8609e68161	Example sentinel conf: document requirepass.	2020-03-16 13:48:29 +01:00
Salvatore Sanfilippo	15338ab694	Merge pull request #6991 from soloestoy/io-threads-bugfix ... Threaded IO: bugfix client kill may crash redis	2020-03-16 10:53:54 +01:00
Salvatore Sanfilippo	f1e4af2c29	Merge pull request #6993 from soloestoy/optimize-threaded-io ... Threaded IO: handle pending reads clients ASAP after event loop	2020-03-16 10:48:23 +01:00
zhaozhao.zz	c46c76a399	Threaded IO: handle pending reads clients ASAP after event loop	2020-03-16 11:20:48 +08:00
zhaozhao.zz	a6a0e05a1a	Threaded IO: bugfix client kill may crash redis	2020-03-15 23:30:25 +08:00
antirez	573c4673ee	Aesthetic changes in PR #6989.	2020-03-15 16:10:37 +01:00
Salvatore Sanfilippo	681c6f21b7	Merge pull request #6989 from soloestoy/io-threads-bugfix ... Threaded IO: bugfix #6988 process events while blocked	2020-03-15 15:57:22 +01:00
zhaozhao.zz	606a01df70	Threaded IO: bugfix #6988 process events while blocked	2020-03-15 22:07:36 +08:00
antirez	453e01a091	Restore newline at the end of redis-cli.c	2020-03-13 16:21:55 +01:00
Salvatore Sanfilippo	ebf1acd33c	Merge pull request #6918 from chendq8/fixModuleUnregisterUsedApi ... Fix module unregister used api	2020-03-13 12:46:27 +01:00
Salvatore Sanfilippo	0628030bf4	Merge pull request #6961 from guodongxiaren/pr ... string literal should be const char*	2020-03-13 12:37:08 +01:00
Salvatore Sanfilippo	cf6cbbb881	Merge pull request #6976 from itamarhaber/ksn-patch ... Adds keyspace notifications to migrate and restore	2020-03-13 12:35:00 +01:00
Salvatore Sanfilippo	3c95c92b0f	Merge pull request #6977 from yangbodong22011/fix-makefile-duplicate-obj ... Remove duplicate obj files in Makefile	2020-03-13 12:32:03 +01:00
Salvatore Sanfilippo	22ae0ddf15	Merge pull request #6974 from yangbodong22011/fix-tcl-test-host-option ... Fix bug of tcl test using external server	2020-03-13 12:27:26 +01:00
Salvatore Sanfilippo	b1db7acf72	Merge pull request #6980 from fengpf/fix_latency_comments ... fix comments in latency.c	2020-03-13 12:26:18 +01:00
antirez	5babacad9b	Update linenoise.	2020-03-12 15:53:08 +01:00
fengpf	a5f5091041	fix comments in latency.c	2020-03-12 20:44:32 +08:00
antirez	2091d73ef5	Merge branch 'unstable' of github.com:/antirez/redis into unstable	2020-03-12 13:25:01 +01:00
antirez	513931dfea	ae.c: fix crash when resizing the event loop. ... See #6964. The root cause is that the event loop may be resized from an event callback itself, causing the event pointer to be invalid.	2020-03-12 13:24:30 +01:00
bodong.ybd	63c4697b46	Remove duplicate obj files in Makefile	2020-03-12 11:12:37 +08:00
Itamar Haber	7d703de7e9	Adds keyspace notifications to migrate and restore	2020-03-11 18:43:03 +02:00
bodong.ybd	336458d4b5	Fix bug of tcl test using external server	2020-03-11 21:01:27 +08:00
Salvatore Sanfilippo	bd28dbee0e	Merge pull request #6834 from lifubang/askpassword ... add askpass mode	2020-03-10 16:51:36 +01:00
Salvatore Sanfilippo	2bd360feca	Merge pull request #6950 from IAmATeaPot418/patch-2 ... Update Redis.conf to improve TLS usability	2020-03-10 16:47:06 +01:00
Jamie Scott	374b1192a3	Remove default guidance in Redis.conf ... Removing the default guidance in Redis.conf since this is not an available value.	2020-03-09 12:53:44 -07:00
guodongxiaren	106a57c5ae	string literal should be const char*	2020-03-07 19:38:27 +08:00
David Carlier	6548157293	debug, dump registers on arm too.	2020-03-07 10:43:41 +00:00
Salvatore Sanfilippo	13707f988b	Merge pull request #6687 from jtru/systemd-integration-fixes ... Signal systemd readiness atfer Partial Resync	2020-03-06 13:15:10 +01:00
Salvatore Sanfilippo	af347a8c86	Merge pull request #6954 from oranagra/fix-flaky-psync2-test ... fix for flaky psync2 test	2020-03-05 16:12:21 +01:00
Oran Agra	27641ee490	fix for flaky psync2 test ... *** [err]: PSYNC2: total sum of full synchronizations is exactly 4 in tests/integration/psync2.tcl Expected 5 == 4 (context: type eval line 6 cmd {assert {$sum == 4}} proc ::test) issue was that sometime the test got an unexpected full sync since it tried to switch to the replica before it was in sync with it's master.	2020-03-05 16:55:14 +02:00
lifubang	1b72f4b749	add askpass mode ... Signed-off-by: lifubang <lifubang@acmcoder.com>	2020-03-05 18:17:32 +08:00
lifubang	2b7b74ad68	update linenoise to fc9667a81d ... Signed-off-by: lifubang <lifubang@acmcoder.com>	2020-03-05 18:13:43 +08:00