Skip to content

Commit 94b88f5

Browse files
authored
fix(command): add missing io-thread key in client info (#3244)
* Add 8.0m3 image in docker compose * Add new key `io-thread` in client info Redis 8.0 introduces new key `io-thread` in the response for client info. The key needs to be parsed. If an unknown key is observed, the client will return an error. * improve readibility * Revert "Add 8.0m3 image in docker compose" This reverts commit 787c41f. * add dockers directory to gitignore
1 parent efe0f65 commit 94b88f5

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
dockers/
12
*.rdb
23
testdata/*
34
.idea/
45
.DS_Store
56
*.tar.gz
6-
*.dic
7+
*.dic

command.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5114,6 +5114,7 @@ type ClientInfo struct {
51145114
OutputListLength int // oll, output list length (replies are queued in this list when the buffer is full)
51155115
OutputMemory int // omem, output buffer memory usage
51165116
TotalMemory int // tot-mem, total memory consumed by this client in its various buffers
5117+
IoThread int // io-thread id
51175118
Events string // file descriptor events (see below)
51185119
LastCmd string // cmd, last command played
51195120
User string // the authenticated username of the client
@@ -5292,6 +5293,8 @@ func parseClientInfo(txt string) (info *ClientInfo, err error) {
52925293
info.LibName = val
52935294
case "lib-ver":
52945295
info.LibVer = val
5296+
case "io-thread":
5297+
info.IoThread, err = strconv.Atoi(val)
52955298
default:
52965299
return nil, fmt.Errorf("redis: unexpected client info key(%s)", key)
52975300
}

main_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ var _ = BeforeSuite(func() {
118118
sentinelSlave2Port, "--slaveof", "127.0.0.1", sentinelMasterPort)
119119
Expect(err).NotTo(HaveOccurred())
120120

121-
Expect(startCluster(ctx, cluster)).NotTo(HaveOccurred())
121+
err = startCluster(ctx, cluster)
122+
Expect(err).NotTo(HaveOccurred())
122123
} else {
123124
redisPort = rediStackPort
124125
redisAddr = rediStackAddr

0 commit comments

Comments
 (0)