Yossi Gottlieb
efea1b2001
Conns: Fix connClose() / connAccept() behavior.
...
We assume accept handlers may choose to reject a connection and close
it, but connAccept() callers can't distinguish between this state and
other error states requiring connClose().
This makes it safe (and mandatory!) to always call connClose() if
connAccept() fails, and safe for accept handlers to close connections
(which will defer).
2020-03-22 14:42:03 +02:00
Salvatore Sanfilippo
279d884983
Merge pull request #7013 from hwware/clusterhelpfix
...
add missing commands description in cluster help
2020-03-20 16:33:10 +01:00
hwware
8d8644b330
add missing commands in cluster help
2020-03-20 09:01:12 -04:00
antirez
08af68436d
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2020-03-20 13:21:28 +01:00
antirez
bbbd16a90d
Regression test for #7011 .
2020-03-20 12:52:06 +01:00
antirez
90f5d83381
ACL: default user off should not allow automatic authentication.
...
This fixes issue #7011 .
2020-03-20 12:45:48 +01:00
Salvatore Sanfilippo
dd181bb36e
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
2ceda2d79d
Merge pull request #7000 from ppillip/patch-1
...
Update redis.conf
2020-03-18 11:06:22 +01:00
Salvatore Sanfilippo
2ff36d4139
Merge pull request #7001 from trevor211/fixDataInconsistency
...
Fix data inconsistency
2020-03-18 11:04:08 +01:00
WuYunlong
f4a6b931cc
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
0c9916d008
Add 14-consistency-check.tcl to prove there is a data consistency issue.
2020-03-18 16:17:46 +08:00
박승현
70705e758d
Update redis.conf
2020-03-18 14:40:50 +09:00
antirez
498e28f98b
Sentinel: document auth-user directive.
2020-03-16 17:11:43 +01:00
antirez
3b5ca2f19f
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
0de01d8e51
Support Redis Cluster Proxy PROXY INFO command
2020-03-16 16:15:02 +01:00
antirez
411aadd83e
Sentinel: implement auth-user directive for ACLs.
2020-03-16 15:59:34 +01:00
antirez
d1493dbc0b
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2020-03-16 13:48:35 +01:00
antirez
bd35171848
Example sentinel conf: document requirepass.
2020-03-16 13:48:29 +01:00
Salvatore Sanfilippo
b790538289
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
ff49d766d8
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
a02e9fc81d
Threaded IO: handle pending reads clients ASAP after event loop
2020-03-16 11:20:48 +08:00
zhaozhao.zz
078c97ea44
Threaded IO: bugfix client kill may crash redis
2020-03-15 23:30:25 +08:00
antirez
4295673072
Aesthetic changes in PR #6989 .
2020-03-15 16:10:37 +01:00
Salvatore Sanfilippo
9b5fcd4aaa
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
c022f07e04
Threaded IO: bugfix #6988 process events while blocked
2020-03-15 22:07:36 +08:00
antirez
e886009f9f
Restore newline at the end of redis-cli.c
2020-03-13 16:21:55 +01:00
Salvatore Sanfilippo
5c2babe9c5
Merge pull request #6918 from chendq8/fixModuleUnregisterUsedApi
...
Fix module unregister used api
2020-03-13 12:46:27 +01:00
Salvatore Sanfilippo
98c47d60c9
Merge pull request #6961 from guodongxiaren/pr
...
string literal should be const char*
2020-03-13 12:37:08 +01:00
Salvatore Sanfilippo
9521b4f1de
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
ee13632d85
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
a96c0ceff6
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
24d39186f0
Merge pull request #6980 from fengpf/fix_latency_comments
...
fix comments in latency.c
2020-03-13 12:26:18 +01:00
antirez
ca0268c0ac
Update linenoise.
2020-03-12 15:53:08 +01:00
fengpf
4278c5ad5d
fix comments in latency.c
2020-03-12 20:44:32 +08:00
antirez
ccae1031e7
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2020-03-12 13:25:01 +01:00
antirez
c99bd27b58
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
e7765e025c
Remove duplicate obj files in Makefile
2020-03-12 11:12:37 +08:00
Itamar Haber
f9ad2cfd75
Adds keyspace notifications to migrate and restore
2020-03-11 18:43:03 +02:00
bodong.ybd
53fd8f4d0d
Fix bug of tcl test using external server
2020-03-11 21:01:27 +08:00
Salvatore Sanfilippo
468332ca80
Merge pull request #6834 from lifubang/askpassword
...
add askpass mode
2020-03-10 16:51:36 +01:00
Salvatore Sanfilippo
aef5b397cd
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
1bf0b5b147
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
512badad1b
string literal should be const char*
2020-03-07 19:38:27 +08:00
Salvatore Sanfilippo
3b68a38464
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
c90b2a4fdd
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
d18e79f91d
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
45570731b9
add askpass mode
...
Signed-off-by: lifubang <lifubang@acmcoder.com>
2020-03-05 18:17:32 +08:00
lifubang
a97330a70e
update linenoise to fc9667a81d
...
Signed-off-by: lifubang <lifubang@acmcoder.com>
2020-03-05 18:13:43 +08:00
antirez
7e15848ddf
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2020-03-05 10:54:51 +01:00
antirez
40b1414e6f
RDB deletion: document it in example redis.conf.
2020-03-04 17:58:05 +01:00