6648 Commits

Author SHA1 Message Date
Jack Drogon
bae1d36e5d Fix typo 2018-07-03 18:19:46 +02:00
antirez
abe790cae3 Clarify the pending_querybuf field of clients. 2018-07-03 13:25:41 +02:00
antirez
24f2f7b69b Improve style of PR #5084. 2018-07-03 13:23:29 +02:00
Salvatore Sanfilippo
3613a8ae24 Merge pull request #5084 from chendq8/pending-querybuf
limit the size of pending-querybuf in masterclient
2018-07-03 13:19:37 +02:00
antirez
574b79fea6 Set repl_down_since to zero on state change.
PR #5081 fixes an "interesting" bug about Redis Cluster failover but in
general about the updating of repl_down_since, that is used in order to
count the time a slave was left disconnected from its master.

While the fix provided resolves the specific issue, in general the
validity of repl_down_since is limited to states that are different
than the state CONNECTED, and the disconnected time is set when the
state is DISCONNECTED. However from CONNECTED to other states, the state
machine must always go to DISCONNECTED first. So it makes sense to set
the field to zero (since it is meaningless in that context) when the
state is set to CONNECTED.
2018-07-03 12:42:14 +02:00
Salvatore Sanfilippo
57c5bd3ae7 Merge pull request #5081 from trevor211/fixClusterFailover
cluster failover bug
2018-07-03 12:36:53 +02:00
chendianqiang
602d502e5c Merge branch 'unstable' into pending-querybuf 2018-07-03 10:07:26 +08:00
antirez
938d879c2a addReplySubSyntaxError() renamed to addReplySubcommandSyntaxError(). 2018-07-02 18:49:34 +02:00
Salvatore Sanfilippo
c44be0ab9b Merge pull request #4998 from itamarhaber/module_command_help
Module command help
2018-07-02 18:46:56 +02:00
Salvatore Sanfilippo
6a55b40348 Merge pull request #5068 from shenlongxing/fix-rename-command
fix empty string for sentinel rename-command
2018-07-02 18:40:35 +02:00
chendianqiang
117a76ac63 limit the size of pending-querybuf in masterclient 2018-07-01 14:43:53 +08:00
WuYunlong
59dd29bb35 fix server.repl_down_since resetting, so that slaves could failover
automatically as expected.
2018-06-30 09:39:08 +08:00
antirez
01c617ea23 Change CLIENT LIST TYPE help string.
Making it more similar to KILL.
2018-06-29 18:03:00 +02:00
Salvatore Sanfilippo
6ceda1d89c Merge pull request #5075 from soloestoy/client-list-types
FEATURE: implements client list type option
2018-06-29 18:00:32 +02:00
Salvatore Sanfilippo
f6cfaa1106 Merge pull request #5074 from soloestoy/fix-compile-warning
fix some compile warnings
2018-06-29 17:56:47 +02:00
Salvatore Sanfilippo
611dc4f6d3 Merge pull request #5076 from 0xtonyxia/add-no-auth-warning-option
Add no auth warning option
2018-06-29 13:32:58 +02:00
dejun.xdj
65f043f706 Check if password is used on command line interface. 2018-06-28 19:09:22 +08:00
dejun.xdj
0fb2c8d5ea Fix trailing white space. 2018-06-28 18:47:28 +08:00
dejun.xdj
62d5696fa6 Fix code format issue. 2018-06-28 18:39:42 +08:00
dejun.xdj
f8831b81df Don't output password warning message when --no-auth-warning is used. 2018-06-28 18:38:24 +08:00
dejun.xdj
16164e3112 Avoid -Woverlength-strings compile warning.
Using another fprintf call to output the rest help message.
2018-06-28 18:22:06 +08:00
antirez
b6f7e996d3 Rax library updated (node callback). 2018-06-28 12:19:06 +02:00
dejun.xdj
f056c33fd9 Add --no-auth-warning help message. 2018-06-28 18:17:04 +08:00
zhaozhao.zz
c9c7dab4f3 clients: add type option for client list 2018-06-28 17:43:05 +08:00
zhaozhao.zz
9a2ea0ebcd clients: show pubsub flag in client list 2018-06-28 17:28:38 +08:00
zhaozhao.zz
07f01cc4cd fix some compile warnings 2018-06-28 17:22:59 +08:00
antirez
e0ac088c80 Make CLIENT HELP output nicer to the eyes. 2018-06-28 00:21:32 +02:00
antirez
38ebd5ecd7 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-06-28 00:17:21 +02:00
antirez
55d4e2a350 Add unblock in CLIENT HELP. 2018-06-28 00:17:10 +02:00
shenlongxing
5dc5b63233 fix empty string for sentinel rename-command 2018-06-28 01:08:55 +08:00
Salvatore Sanfilippo
f136c681b5 Merge pull request #5067 from mpaltun/mpaltun-doc-fix
Streams documentation fix
2018-06-27 18:54:27 +02:00
antirez
e0c946cf00 CLIENT UNBLOCK: support unblocking by error. 2018-06-27 18:51:06 +02:00
Mustafa Paltun
d0a9dae861 Update t_stream.c 2018-06-27 16:35:30 +03:00
Mustafa Paltun
1d578ca80e Update help.h 2018-06-27 16:33:31 +03:00
antirez
f84c14ce3e CLIENT UNBLOCK implemented. 2018-06-27 14:08:42 +02:00
antirez
a80eb8a554 Take clients in a ID -> Client handle dictionary. 2018-06-27 14:08:42 +02:00
antirez
4d6d7aa619 CLIENT ID implemented. 2018-06-27 14:08:42 +02:00
Oran Agra
160802b06f add active defrag support for streams 2018-06-27 15:00:41 +03:00
Salvatore Sanfilippo
26aef9fb0d Merge pull request #5027 from tigertv/unstable
Update sort.c
2018-06-26 16:13:20 +02:00
Salvatore Sanfilippo
34a943c5c7 Merge pull request #5059 from guybe7/fix_restore_warning
Fix compiler warning in restoreCommand
2018-06-26 14:41:48 +02:00
antirez
f2dfdae6a6 Fix type of argslen in sendSynchronousCommand().
Related to #5037.
2018-06-26 14:38:35 +02:00
antirez
bcbb9b71f8 Remove black space. 2018-06-26 14:37:22 +02:00
Salvatore Sanfilippo
6cf68deebb Merge pull request #5037 from madolson/repl-auth-fix
Fixed replication authentication with whitespace password
2018-06-26 14:33:20 +02:00
antirez
d3cc97feae Sentinel: fix SENTINEL SET error reporting.
Thanks to @shenlongxing for reporting the problem.
Related to #5062.
2018-06-26 09:17:38 +02:00
Madelyn Olson
755109f784 Addressed comments 2018-06-26 00:57:35 +00:00
Madelyn Olson
317e235b8d Fixed replication authentication with whitespace in password 2018-06-26 00:48:37 +00:00
antirez
5283f0871d Sentinel: drop the renamed-command entry in a more natural way.
Instead of telling the user to set the renamed command to "" to remove
the renaming, to the obvious thing when a command is renamed to itself.

So if I want to remove the renaming of PING, I just rename it to PING
again.
2018-06-25 17:50:46 +02:00
antirez
a3a09dbce3 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-06-25 17:34:12 +02:00
antirez
369161563b Sentinel command renaming: use case sensitive hashing for the dict. 2018-06-25 17:31:57 +02:00
antirez
0f1c018548 Sentinel command renaming: fix CONFIG SET event logging. 2018-06-25 17:24:04 +02:00