server:add qps axis for tidbdashborad ref: pingcap/tidb-dashboard/iss…

…ues/1209 Signed-off-by: qidi1 <1083369179@qq.com>
IcePigZDB · May 9, 2022 · 9febf07 · 9febf07
1 parent 56a015c
commit 9febf07
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/pkg/dashboard/keyvisual/input/core.go b/pkg/dashboard/keyvisual/input/core.go
@@ -51,6 +51,7 @@ func (rs RegionsInfo) GetValues(tag regionpkg.StatTag) []uint64 {
 		for i, region := range rs {
 			values[i] = region.GetBytesWritten()
 		}
+		log.Info("[regionpkg] get written bytes", zap.Any("GetBytesWritten", values))
 	case regionpkg.ReadBytes:
 		for i, region := range rs {
 			values[i] = region.GetBytesRead()
@@ -63,6 +64,14 @@ func (rs RegionsInfo) GetValues(tag regionpkg.StatTag) []uint64 {
 		for i, region := range rs {
 			values[i] = region.GetKeysRead()
 		}
+	case regionpkg.WriteQueryNum:
+		for i, region := range rs {
+			values[i] = region.GetWriteQueryNum()
+		}
+	case regionpkg.ReadQueryNum:
+		for i, region := range rs {
+			values[i] = region.GetReadQueryNum()
+		}
 	case regionpkg.Integration:
 		for i, region := range rs {
 			values[i] = region.GetBytesWritten() + region.GetBytesRead()

diff --git a/server/api/region.go b/server/api/region.go
@@ -113,6 +113,8 @@ type RegionInfo struct {
 	ReadBytes       uint64        `json:"read_bytes"`
 	WrittenKeys     uint64        `json:"written_keys"`
 	ReadKeys        uint64        `json:"read_keys"`
+	WriteQueryNum   uint64        `json:"write_query_num"`
+	ReadQueryNum    uint64        `json:"read_query_num"`
 	ApproximateSize int64         `json:"approximate_size"`
 	ApproximateKeys int64         `json:"approximate_keys"`
 	Buckets         []string      `json:"buckets,omitempty"`
@@ -158,8 +160,10 @@ func InitRegion(r *core.RegionInfo, s *RegionInfo) *RegionInfo {
 	s.PendingPeers = fromPeerSlice(r.GetPendingPeers())
 	s.WrittenBytes = r.GetBytesWritten()
 	s.WrittenKeys = r.GetKeysWritten()
+	s.WriteQueryNum = r.GetWriteQueryNum()
 	s.ReadBytes = r.GetBytesRead()
 	s.ReadKeys = r.GetKeysRead()
+	s.ReadQueryNum = r.GetReadQueryNum()
 	s.ApproximateSize = r.GetApproximateSize()
 	s.ApproximateKeys = r.GetApproximateKeys()
 	s.ReplicationStatus = fromPBReplicationStatus(r.GetReplicationStatus())

diff --git a/server/api/region_test.go b/server/api/region_test.go
@@ -146,8 +146,10 @@ func (s *testRegionSuite) TestRegion(c *C) {
 	c.Assert(readJSON(testDialClient, url, &r1m), IsNil)
 	c.Assert(r1m["written_bytes"].(float64), Equals, float64(r.GetBytesWritten()))
 	c.Assert(r1m["written_keys"].(float64), Equals, float64(r.GetKeysWritten()))
+	c.Assert(r1m["write_query_num"].(float64), Equals, float64(r.GetWriteQueryNum()))
 	c.Assert(r1m["read_bytes"].(float64), Equals, float64(r.GetBytesRead()))
 	c.Assert(r1m["read_keys"].(float64), Equals, float64(r.GetKeysRead()))
+	c.Assert(r1m["read_query_num"].(float64), Equals, float64(r.GetReadQueryNum()))
 	keys := r1m["buckets"].([]interface{})
 	c.Assert(keys, HasLen, 2)
 	c.Assert(keys[0].(string), Equals, core.HexRegionKeyStr([]byte("a")))