diff --git a/src/quicklist.h b/src/quicklist.h index 04136a733..dc30cafd9 100644 --- a/src/quicklist.h +++ b/src/quicklist.h @@ -107,7 +107,7 @@ typedef struct quicklist { quicklistNode *tail; unsigned long count; /* total count of all entries in all listpacks */ unsigned long len; /* number of quicklistNodes */ - unsigned int fill : QL_FILL_BITS; /* fill factor for individual nodes */ + signed int fill : QL_FILL_BITS; /* fill factor for individual nodes */ unsigned int compress : QL_COMP_BITS; /* depth of end nodes not to compress;0=off */ unsigned int bookmark_count: QL_BM_BITS; quicklistBookmark bookmarks[]; diff --git a/src/server.c b/src/server.c index 529e5e6b6..977d87eba 100644 --- a/src/server.c +++ b/src/server.c @@ -3215,7 +3215,7 @@ int processCommand(client *c) { if ((c->cmd->proc == debugCommand && !allowProtectedAction(server.enable_debug_cmd, c)) || (c->cmd->proc == moduleCommand && !allowProtectedAction(server.enable_module_cmd, c))) { - rejectCommandFormat(c,"%s command not allowed. If the %s option is set to \"local\"," + rejectCommandFormat(c,"%s command not allowed. If the %s option is set to \"local\", " "you can run it from a local connection, otherwise you need to set this option " "in the configuration file, and then restart the server.", c->cmd->proc == debugCommand ? "DEBUG" : "MODULE", diff --git a/tests/cluster/run.tcl b/tests/cluster/run.tcl index d9a7d7ee5..c81d8f39d 100644 --- a/tests/cluster/run.tcl +++ b/tests/cluster/run.tcl @@ -15,6 +15,8 @@ proc main {} { spawn_instance redis $::redis_base_port $::instances_count { "cluster-enabled yes" "appendonly yes" + "enable-protected-configs yes" + "enable-debug-command yes" } run_tests cleanup diff --git a/tests/sentinel/run.tcl b/tests/sentinel/run.tcl index 64c99c103..98c4c118b 100644 --- a/tests/sentinel/run.tcl +++ b/tests/sentinel/run.tcl @@ -13,8 +13,16 @@ proc main {} { if {$::leaked_fds_file != ""} { set ::env(LEAKED_FDS_FILE) $::leaked_fds_file } - spawn_instance sentinel $::sentinel_base_port $::instances_count [list "sentinel deny-scripts-reconfig no"] "../tests/includes/sentinel.conf" - spawn_instance redis $::redis_base_port $::instances_count + spawn_instance sentinel $::sentinel_base_port $::instances_count { + "sentinel deny-scripts-reconfig no" + "enable-protected-configs yes" + "enable-debug-command yes" + } "../tests/includes/sentinel.conf" + + spawn_instance redis $::redis_base_port $::instances_count { + "enable-protected-configs yes" + "enable-debug-command yes" + } run_tests cleanup end_tests