7051 Commits

Author SHA1 Message Date
Salvatore Sanfilippo
4bcdfb0c5d 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
32fc058177 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
c8110e814c Merge pull request #5081 from trevor211/fixClusterFailover
cluster failover bug
2018-07-03 12:36:53 +02:00
chendianqiang
0a32c93dd5 Merge branch 'unstable' into pending-querybuf 2018-07-03 10:07:26 +08:00
antirez
9f30306d44 addReplySubSyntaxError() renamed to addReplySubcommandSyntaxError(). 2018-07-02 18:49:34 +02:00
Salvatore Sanfilippo
e7b480369b Merge pull request #4998 from itamarhaber/module_command_help
Module command help
2018-07-02 18:46:56 +02:00
Salvatore Sanfilippo
b077de1862 Merge pull request #5071 from akshaynagpal/patch-2
Added link to Google Group
2018-07-02 18:41:58 +02:00
Salvatore Sanfilippo
5c3a0414d0 Merge pull request #5068 from shenlongxing/fix-rename-command
fix empty string for sentinel rename-command
2018-07-02 18:40:35 +02:00
Salvatore Sanfilippo
dc30938cbc Merge pull request #5090 from trevor211/test_helper_tcl
fix tests/test_helper.tcl with --wait-server option.
2018-07-02 17:51:04 +02:00
WuYunlong
a14da4dfe3 fix tests/test_helper.tcl with --wait-server option.
Issue #5063 added --wait-server option, but can not work.
2018-07-02 19:26:52 +08:00
chendianqiang
2dc66b6bcc limit the size of pending-querybuf in masterclient 2018-07-01 14:43:53 +08:00
WuYunlong
cfa0f8850d fix server.repl_down_since resetting, so that slaves could failover
automatically as expected.
2018-06-30 09:39:08 +08:00
WuYunlong
f50f714c92 cluster.tcl: Add master consecutively down test. 2018-06-30 09:29:35 +08:00
antirez
56750fbaed Change CLIENT LIST TYPE help string.
Making it more similar to KILL.
2018-06-29 18:03:00 +02:00
Salvatore Sanfilippo
3314ac96e3 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
7f0c97febf Merge pull request #5074 from soloestoy/fix-compile-warning
fix some compile warnings
2018-06-29 17:56:47 +02:00
Salvatore Sanfilippo
81597e4e64 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
4535fd3b8b Check if password is used on command line interface. 2018-06-28 19:09:22 +08:00
dejun.xdj
2171b9622d Fix trailing white space. 2018-06-28 18:47:28 +08:00
dejun.xdj
e9feeb822a Fix code format issue. 2018-06-28 18:39:42 +08:00
dejun.xdj
47308e7a14 Don't output password warning message when --no-auth-warning is used. 2018-06-28 18:38:24 +08:00
dejun.xdj
a9ec9aa0ae Avoid -Woverlength-strings compile warning.
Using another fprintf call to output the rest help message.
2018-06-28 18:22:06 +08:00
antirez
4ff8dc478f Rax library updated (node callback). 2018-06-28 12:19:06 +02:00
dejun.xdj
e8a7af858a Add --no-auth-warning help message. 2018-06-28 18:17:04 +08:00
zhaozhao.zz
483f7d3222 clients: add type option for client list 2018-06-28 17:43:05 +08:00
zhaozhao.zz
eb6fa7e4af clients: show pubsub flag in client list 2018-06-28 17:28:38 +08:00
zhaozhao.zz
7a04c30907 fix some compile warnings 2018-06-28 17:22:59 +08:00
Akshay Nagpal
cd5e9a5fd2 Added link to Google Group 2018-06-27 20:08:39 -04:00
antirez
ec9e232d87 Make CLIENT HELP output nicer to the eyes. 2018-06-28 00:21:32 +02:00
antirez
dee970724d Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-06-28 00:17:21 +02:00
antirez
60ade804fe Add unblock in CLIENT HELP. 2018-06-28 00:17:10 +02:00
shenlongxing
e38f95a5ad fix empty string for sentinel rename-command 2018-06-28 01:08:55 +08:00
Salvatore Sanfilippo
5b7d5add43 Merge pull request #5066 from oranagra/defrag_jemalloc5_fix
minor fix in creating a stream NACK for rdb and defrag tests
2018-06-27 18:56:49 +02:00
Salvatore Sanfilippo
11b19b264f Merge pull request #5067 from mpaltun/mpaltun-doc-fix
Streams documentation fix
2018-06-27 18:54:27 +02:00
antirez
c14090b8f4 CLIENT UNBLOCK: support unblocking by error. 2018-06-27 18:51:06 +02:00
Mustafa Paltun
457697f039 Update t_stream.c 2018-06-27 16:35:30 +03:00
Mustafa Paltun
47515fa348 Update help.h 2018-06-27 16:33:31 +03:00
Oran Agra
9df4b2b9b4 minor fix in creating a stream NACK for rdb and defrag tests 2018-06-27 15:34:17 +03:00
antirez
8672ffbe0b CLIENT UNBLOCK implemented. 2018-06-27 14:08:42 +02:00
antirez
97842a346d Take clients in a ID -> Client handle dictionary. 2018-06-27 14:08:42 +02:00
antirez
c31ae4f8f4 CLIENT ID implemented. 2018-06-27 14:08:42 +02:00
Salvatore Sanfilippo
ddbb355d96 Merge pull request #5063 from oranagra/test_suite_improvements
test suite infra improvements and fix
2018-06-27 14:07:25 +02:00
Salvatore Sanfilippo
91166f54fd Merge pull request #5065 from oranagra/defrag_jemalloc5
defrag hint support for jemalloc 5, and active defrag for streams
2018-06-27 14:05:16 +02:00
Oran Agra
cfa076f2ee add active defrag support for streams 2018-06-27 15:00:41 +03:00
Oran Agra
c4f4a2c3ef add defrag hint support into jemalloc 5 2018-06-27 10:52:39 +03:00
Oran Agra
9cb031adaa test suite infra improvements and fix
* fail the test (exit code) in case of timeout.
* add --wait-server to allow attaching a debugger
* add --dont-clean to keep log files when tests are done
2018-06-26 20:23:55 +03:00
Salvatore Sanfilippo
22b87358a2 Merge pull request #5027 from tigertv/unstable
Update sort.c
2018-06-26 16:13:20 +02:00
antirez
7f1573dacd Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-06-26 16:09:09 +02:00
antirez
30b75cef3b Sentinel: test command renaming feature. 2018-06-26 16:08:43 +02:00
Salvatore Sanfilippo
9b071acc7c Merge pull request #5059 from guybe7/fix_restore_warning
Fix compiler warning in restoreCommand
2018-06-26 14:41:48 +02:00