8835 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
antirez	50d4326e3b	Merge branch 'unstable' of github.com:/antirez/redis into unstable	2020-02-06 11:24:22 +01:00
antirez	d5c6a833c8	Merge branch 'acl-log' into unstable	2020-02-06 11:24:16 +01:00
Salvatore Sanfilippo	1012514e0f	Merge pull request #6826 from lifubang/opensslcli ... fix ssl args check for redis-cli	2020-02-06 11:22:20 +01:00
Salvatore Sanfilippo	5bfba06a3b	Merge pull request #6821 from guybe7/key_miss_notify ... Exclude "keymiss" notification from NOTIFY_ALL	2020-02-06 10:43:05 +01:00
Salvatore Sanfilippo	2e1dd00c80	Merge pull request #6837 from oranagra/signal_modified_key_doc ... update RM_SignalModifiedKey doc comment	2020-02-06 10:38:36 +01:00
Salvatore Sanfilippo	730cacf672	Merge pull request #6840 from oranagra/short_read_moduleid ... Add handling of short read of module id in rdb	2020-02-06 10:35:42 +01:00
Salvatore Sanfilippo	4abba65ec7	Merge pull request #6841 from yossigo/tls-doc-update ... TLS: Update documentation.	2020-02-06 10:35:21 +01:00
Salvatore Sanfilippo	33f613bf87	Merge pull request #6843 from oranagra/command_flags ... A few non-data commands that should be allowed while loading or stale	2020-02-06 10:34:26 +01:00
Salvatore Sanfilippo	4aafdb185a	Merge pull request #6844 from oranagra/bind_config_leak ... Memory leak when bind config is provided twice	2020-02-06 10:33:40 +01:00
Salvatore Sanfilippo	be520829b8	Merge pull request #6845 from oranagra/maxmemory_warning ... fix maxmemory config warning	2020-02-06 10:33:15 +01:00
Salvatore Sanfilippo	13741fb99d	Merge pull request #6846 from oranagra/module_client_flags ... Fix client flags to be int64 in module.c	2020-02-06 10:32:35 +01:00
Salvatore Sanfilippo	08b218bfa5	Merge pull request #6847 from oranagra/module_read_err_panic ... moduleRDBLoadError, add key name, and use panic rather than exit	2020-02-06 10:31:29 +01:00
Salvatore Sanfilippo	5558c0e4cf	Merge pull request #6848 from oranagra/opt_use_diskless_load_calls ... reduce repeated calls to use_diskless_load	2020-02-06 10:30:39 +01:00
Salvatore Sanfilippo	7cf53252ee	Merge pull request #6849 from oranagra/free_client_mutex ... freeClientAsync don't lock mutex if there's just one thread	2020-02-06 10:29:46 +01:00
Salvatore Sanfilippo	44266d6d92	Merge pull request #6850 from oranagra/restart_aof_unset_master ... move restartAOFAfterSYNC from replicaofCommand to replicationUnsetMaster	2020-02-06 10:27:05 +01:00
Salvatore Sanfilippo	58a3a3fa68	Merge pull request #6851 from oranagra/aof_rewrite_scheduled ... stopAppendOnly resets aof_rewrite_scheduled	2020-02-06 10:23:11 +01:00
Salvatore Sanfilippo	711b13801e	Merge pull request #6852 from oranagra/acl_help ... add SAVE subcommand to ACL HELP and top comment	2020-02-06 10:22:16 +01:00
Salvatore Sanfilippo	f25962337d	Merge pull request #6853 from oranagra/debug_help ... DEBUG HELP - add PROTOCOL	2020-02-06 10:21:55 +01:00
Salvatore Sanfilippo	15c7f1317e	Merge pull request #6854 from guybe7/mem_overhead_miscalc ... Fix small bugs related to replica and monitor ambiguity	2020-02-06 10:21:30 +01:00
Guy Benoish	91c41b6dde	Some refactroing using getClientType instead of CLIENT_SLAVE	2020-02-06 14:12:08 +05:30
Oran Agra	31ffbf1133	DEBUG HELP - add PROTOCOL	2020-02-06 10:40:29 +02:00
Guy Benoish	e33fffbde1	Fix small bugs related to replica and monitor ambiguity ... 1. server.repl_no_slaves_since can be set when a MONITOR client disconnects 2. c->repl_ack_time can be set by a newline from a MONITOR client 3. Improved comments	2020-02-06 14:10:02 +05:30
Oran Agra	6d29c34da7	add SAVE subcommand to ACL HELP and top comment	2020-02-06 10:31:43 +02:00
Oran Agra	69e8ea7143	stopAppendOnly resets aof_rewrite_scheduled ... althouh in theory, users can do BGREWRITEAOF even if aof is disabled, i suppose it is more common that the scheduled flag is set by either startAppendOnly, of a failed initial AOFRW fork (AOF_WAIT_REWRITE)	2020-02-06 10:17:34 +02:00
Oran Agra	aac6a4cf13	move restartAOFAfterSYNC from replicaofCommand to replicationUnsetMaster ... replicationUnsetMaster can be called from other places, not just replicaofCOmmand, and all of these need to restart AOF	2020-02-06 10:14:32 +02:00
Oran Agra	86e302f5f3	freeClientAsync don't lock mutex if there's just one thread	2020-02-06 10:07:17 +02:00
Oran Agra	485d5d4a18	reduce repeated calls to use_diskless_load ... this function possibly iterates on the module list	2020-02-06 09:41:45 +02:00
Oran Agra	85cc696f50	moduleRDBLoadError, add key name, and use panic rather than exit ... using panic rather than exit means you get s stack trace of the code path that experianced the error, and possibly other info.	2020-02-06 09:37:04 +02:00
Oran Agra	d454d5a4f5	Fix client flags to be int64 in module.c ... currently there's no bug since the flags these functions handle are always lower than 32bit, but still better fix the type to prevent future bugs.	2020-02-06 09:33:20 +02:00
Oran Agra	a17bddf2a1	fix maxmemory config warning ... the warning condition was if usage > limit (saying it'll cause eviction or oom), but in fact the eviction and oom depends on used minus slave buffers. other than fixing the condition, i add info about the current usage and limit, which may be useful when looking at the log.	2020-02-06 09:23:22 +02:00
Oran Agra	7e1d5954e5	Memory leak when bind config is provided twice	2020-02-06 09:17:39 +02:00
Oran Agra	ac2c96f5b1	A few non-data commands that should be allowed while loading or stale ... SELECT, and HELLO are commands that may be executed by the client as soon as it connects, there's no reason to block them, preventing the client from doing the rest of his sequence (which might just be INFO or CONFIG, etc). MONITOR, DEBUG, SLOWLOG, TIME, LASTSAVE are all non-data accessing commands, which there's no reason to block.	2020-02-06 08:53:23 +02:00
Yossi Gottlieb	bb3d45a386	TLS: Update documentation.	2020-02-05 21:19:03 +02:00
Oran Agra	fe7e8dc955	Add handling of short read of module id in rdb	2020-02-05 19:47:09 +02:00
Salvatore Sanfilippo	edfe1b2f8b	Merge pull request #6839 from yossigo/fix/redis-conf-tls-clarifications ... TLS: Some redis.conf clarifications.	2020-02-05 17:33:21 +01:00
Yossi Gottlieb	1e02d599dc	TLS: Some redis.conf clarifications.	2020-02-05 18:30:12 +02:00
Oran Agra	3795aaf42a	update RM_SignalModifiedKey doc comment	2020-02-05 18:15:38 +02:00
Salvatore Sanfilippo	44ac202fbf	Merge pull request #6831 from oranagra/config_c_refactor_3 ... config.c verbose error replies for CONFIG SET, like config file parsing	2020-02-05 13:41:15 +01:00
Salvatore Sanfilippo	4abf0e1e10	Merge pull request #6829 from oranagra/memory_get_keys ... memoryGetKeys helper function so that ACL can limit access to keys for MEMORY command	2020-02-05 13:33:18 +01:00
Oran Agra	ffdd0620d0	config.c verbose error replies for CONFIG SET, like config file parsing ... We noticed that the error replies for the generic mechanism for enums are very verbose for config file parsing, but not for config set command. instead of replicating this code, i did a small refactoring to share code between CONFIG SET and config file parsing. and also renamed the enum group functions to be consistent with the naming of other types.	2020-02-05 11:41:24 +02:00
Oran Agra	9ac6cb9ce4	memoryGetKeys helper function so that ACL can limit access to keys for MEMORY command	2020-02-05 09:42:49 +02:00
antirez	90fae58b49	ACL LOG: make max log entries configurable.	2020-02-04 13:19:40 +01:00
antirez	64a73e9293	ACL LOG: test for AUTH reason.	2020-02-04 12:58:48 +01:00
antirez	0c1a4b5576	ACL LOG: log failed auth attempts.	2020-02-04 12:55:26 +01:00
lifubang	540b917a26	fix ssl flag check for redis-cli ... Signed-off-by: lifubang <lifubang@acmcoder.com>	2020-02-04 17:32:30 +08:00
Salvatore Sanfilippo	cfe39b7859	Merge pull request #6818 from leomurillo/zskiplistLevels ... Set ZSKIPLIST_MAXLEVEL to 32	2020-02-04 10:20:56 +01:00
Salvatore Sanfilippo	6ca1ad1e27	Merge pull request #6825 from trevor211/fixMemoryLeakAboutLuaScript ... Fix memory leak about lua script	2020-02-04 10:19:16 +01:00
WuYunlong	eb2196f5ce	Fix lua related memory leak.	2020-02-04 16:38:46 +08:00
WuYunlong	01eaf53bb3	Add tcl regression test in scripting.tcl to reproduce memory leak.	2020-02-04 16:34:11 +08:00
Salvatore Sanfilippo	2400f5782e	Merge pull request #6808 from yossigo/fix/redis-cli-openssl-1.0.x ... TLS: Fix missing initialization in redis-cli.	2020-02-03 16:43:56 +01:00