From b3660be8f5fbf495b960407ff22d83f824161b74 Mon Sep 17 00:00:00 2001
From: WuYunlong <xzsyeb@126.com>
Date: Fri, 13 Jul 2018 17:51:06 +0800
Subject: [PATCH 1/2] Add test in slowlog.tcl
---
tests/unit/slowlog.tcl | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tests/unit/slowlog.tcl b/tests/unit/slowlog.tcl
index fce02498..dbd7a154 100644
--- a/tests/unit/slowlog.tcl
+++ b/tests/unit/slowlog.tcl
@@ -78,4 +78,14 @@ start_server {tags {"slowlog"} overrides {slowlog-log-slower-than 1000000}} {
set e [lindex [r slowlog get] 0]
assert_equal {lastentry_client} [lindex $e 5]
}
+
+ test {SLOWLOG - can be disabled} {
+ r config set slowlog-log-slower-than 1
+ r slowlog reset
+ assert_equal [r slowlog len] 1
+ r config set slowlog-log-slower-than -1
+ r slowlog reset
+ r debug sleep 0.2
+ assert_equal [r slowlog len] 0
+ }
}
From d6ba4fd56d9e386abaf6926fa47ead1525ff56cb Mon Sep 17 00:00:00 2001
From: WuYunlong <xzsyeb@126.com>
Date: Fri, 13 Jul 2018 17:53:55 +0800
Subject: [PATCH 2/2] Fix config set slowlog-log-slower-than and condition in
createLatencyReport
---
src/config.c | 2 +-
src/latency.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/config.c b/src/config.c
index aedef488..54494c8e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1122,7 +1122,7 @@ void configSetCommand(client *c) {
} config_set_numerical_field(
"lua-time-limit",server.lua_time_limit,0,LONG_MAX) {
} config_set_numerical_field(
- "slowlog-log-slower-than",server.slowlog_log_slower_than,0,LLONG_MAX) {
+ "slowlog-log-slower-than",server.slowlog_log_slower_than,-1,LLONG_MAX) {
} config_set_numerical_field(
"slowlog-max-len",ll,0,LONG_MAX) {
/* Cast to unsigned. */
diff --git a/src/latency.c b/src/latency.c
index 87e92607..e8d2af30 100644
--- a/src/latency.c
+++ b/src/latency.c
@@ -294,7 +294,7 @@ sds createLatencyReport(void) {
/* Potentially commands. */
if (!strcasecmp(event,"command")) {
- if (server.slowlog_log_slower_than == 0) {
+ if (server.slowlog_log_slower_than < 0) {
advise_slowlog_enabled = 1;
advices++;
} else if (server.slowlog_log_slower_than/1000 >