Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the slow log timestamp error. #2114

Merged
merged 2 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/pika_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ class PikaServer : public pstd::noncopyable {
void SlowlogReset();
uint32_t SlowlogLen();
void SlowlogObtain(int64_t number, std::vector<SlowlogEntry>* slowlogs);
void SlowlogPushEntry(const PikaCmdArgsType& argv, int32_t time, int64_t duration);
void SlowlogPushEntry(const PikaCmdArgsType& argv, int64_t time, int64_t duration);

/*
* Statistic used
Expand Down
2 changes: 1 addition & 1 deletion src/pika_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,7 @@ void PikaServer::SlowlogObtain(int64_t number, std::vector<SlowlogEntry>* slowlo
}
}

void PikaServer::SlowlogPushEntry(const PikaCmdArgsType& argv, int32_t time, int64_t duration) {
void PikaServer::SlowlogPushEntry(const PikaCmdArgsType& argv, int64_t time, int64_t duration) {
SlowlogEntry entry;
uint32_t slargc = (argv.size() < SLOWLOG_ENTRY_MAX_ARGC) ? argv.size() : SLOWLOG_ENTRY_MAX_ARGC;

Expand Down
47 changes: 46 additions & 1 deletion tests/integration/slowlog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ import (
"github.com/redis/go-redis/v9"
)

func isBetween(first, second, target int64) bool {
return first <= target && second >= target
}

var _ = Describe("Slowlog Commands", func() {
ctx := context.TODO()
var client *redis.Client
Expand All @@ -23,7 +27,7 @@ var _ = Describe("Slowlog Commands", func() {
Expect(client.Close()).NotTo(HaveOccurred())
})

Describe("SlowLogGet", func() {
Describe("SlowLog", func() {
It("returns slow query result", func() {
const key = "slowlog-log-slower-than"

Expand All @@ -40,5 +44,46 @@ var _ = Describe("Slowlog Commands", func() {
Expect(err).NotTo(HaveOccurred())
Expect(len(result)).NotTo(BeZero())
})
It("Should be able to handle the situation when the log is full correctly", func() {
const key1 = "slowlog-log-slower-than"
old := client.ConfigGet(ctx, key1).Val()
defer Expect(client.ConfigSet(ctx, key1, old[key1]).Err()).NotTo(HaveOccurred())
client.ConfigSet(ctx, key1, "0")

const key2 = "slowlog-max-len"
oldMaxLen := client.ConfigGet(ctx, key2).Val()
defer Expect(client.ConfigSet(ctx, key2, oldMaxLen[key2]).Err()).NotTo(HaveOccurred())
client.ConfigSet(ctx, key2, "10")

for i := 0; i < 20; i++ {
Expect(client.Ping(ctx).Err()).NotTo(HaveOccurred())
}

result, err := client.SlowLogGet(ctx, -1).Result()
Expect(err).NotTo(HaveOccurred())
Expect(len(result)).To(Equal(int(10)))
})
It("Make sure that the returned timestamp is correct.", func() {
const key1 = "slowlog-log-slower-than"
old := client.ConfigGet(ctx, key1).Val()
defer Expect(client.ConfigSet(ctx, key1, old[key1]).Err()).NotTo(HaveOccurred())
client.ConfigSet(ctx, key1, "0")
time1 := time.Now()
Expect(client.Do(ctx, "SLOWLOG", "reset").Val()).To(Equal("OK"))

time.Sleep(200 * time.Millisecond)
for i := 0; i < 15; i++ {
Expect(client.Ping(ctx).Err()).NotTo(HaveOccurred())
}
result, err := client.SlowLogGet(ctx, 10).Result()
time.Sleep(200 * time.Millisecond)
time2 := time.Now()
Expect(err).NotTo(HaveOccurred())

for i := 0; i < 10; i++ {
Expect(isBetween(time1.UnixNano(), time2.UnixNano(), time.Unix(0, result[i].Time.Unix()*1e3).UnixNano())).To(Equal(true))
}
})
})

})