diff --git a/.gitignore b/.gitignore index 6f868895..7507584f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ +dockers/ *.rdb testdata/* .idea/ .DS_Store *.tar.gz -*.dic \ No newline at end of file +*.dic diff --git a/command.go b/command.go index 3cb9538a..f5aad914 100644 --- a/command.go +++ b/command.go @@ -5114,6 +5114,7 @@ type ClientInfo struct { OutputListLength int // oll, output list length (replies are queued in this list when the buffer is full) OutputMemory int // omem, output buffer memory usage TotalMemory int // tot-mem, total memory consumed by this client in its various buffers + IoThread int // io-thread id Events string // file descriptor events (see below) LastCmd string // cmd, last command played User string // the authenticated username of the client @@ -5292,6 +5293,8 @@ func parseClientInfo(txt string) (info *ClientInfo, err error) { info.LibName = val case "lib-ver": info.LibVer = val + case "io-thread": + info.IoThread, err = strconv.Atoi(val) default: return nil, fmt.Errorf("redis: unexpected client info key(%s)", key) } diff --git a/main_test.go b/main_test.go index 44f8e682..9f99b5c9 100644 --- a/main_test.go +++ b/main_test.go @@ -118,7 +118,8 @@ var _ = BeforeSuite(func() { sentinelSlave2Port, "--slaveof", "127.0.0.1", sentinelMasterPort) Expect(err).NotTo(HaveOccurred()) - Expect(startCluster(ctx, cluster)).NotTo(HaveOccurred()) + err = startCluster(ctx, cluster) + Expect(err).NotTo(HaveOccurred()) } else { redisPort = rediStackPort redisAddr = rediStackAddr