Merge branch 'master' into add-lock-metrics

nolouch · Mar 11, 2024 · 846ddec · 846ddec
2 parents 4d9a680 + 1d77b25
commit 846ddec
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/client/keyspace_client.go b/client/keyspace_client.go
@@ -21,6 +21,7 @@ import (
 	"github.com/opentracing/opentracing-go"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/keyspacepb"
+	"github.com/tikv/pd/client/errs"
 )
 
 // KeyspaceClient manages keyspace metadata.
@@ -56,7 +57,12 @@ func (c *client) LoadKeyspace(ctx context.Context, name string) (*keyspacepb.Key
 		Header: c.requestHeader(),
 		Name:   name,
 	}
-	resp, err := c.keyspaceClient().LoadKeyspace(ctx, req)
+	protoClient := c.keyspaceClient()
+	if protoClient == nil {
+		cancel()
+		return nil, errs.ErrClientGetProtoClient
+	}
+	resp, err := protoClient.LoadKeyspace(ctx, req)
 	cancel()
 
 	if err != nil {
@@ -96,7 +102,12 @@ func (c *client) UpdateKeyspaceState(ctx context.Context, id uint32, state keysp
 		Id:     id,
 		State:  state,
 	}
-	resp, err := c.keyspaceClient().UpdateKeyspaceState(ctx, req)
+	protoClient := c.keyspaceClient()
+	if protoClient == nil {
+		cancel()
+		return nil, errs.ErrClientGetProtoClient
+	}
+	resp, err := protoClient.UpdateKeyspaceState(ctx, req)
 	cancel()
 
 	if err != nil {
@@ -135,7 +146,12 @@ func (c *client) GetAllKeyspaces(ctx context.Context, startID uint32, limit uint
 		StartId: startID,
 		Limit:   limit,
 	}
-	resp, err := c.keyspaceClient().GetAllKeyspaces(ctx, req)
+	protoClient := c.keyspaceClient()
+	if protoClient == nil {
+		cancel()
+		return nil, errs.ErrClientGetProtoClient
+	}
+	resp, err := protoClient.GetAllKeyspaces(ctx, req)
 	cancel()
 
 	if err != nil {

diff --git a/tools/pd-api-bench/cases/controller.go b/tools/pd-api-bench/cases/controller.go
@@ -214,7 +214,7 @@ func (c *httpController) run() {
 	qps := c.GetQPS()
 	burst := c.GetBurst()
 	cliNum := int64(len(c.clients))
-	tt := time.Duration(base/qps*burst*cliNum) * time.Microsecond
+	tt := time.Duration(base*burst*cliNum/qps) * time.Microsecond
 	log.Info("begin to run http case", zap.String("case", c.Name()), zap.Int64("qps", qps), zap.Int64("burst", burst), zap.Duration("interval", tt))
 	for _, hCli := range c.clients {
 		c.wg.Add(1)
@@ -283,7 +283,7 @@ func (c *gRPCController) run() {
 	qps := c.GetQPS()
 	burst := c.GetBurst()
 	cliNum := int64(len(c.clients))
-	tt := time.Duration(base/qps*burst*cliNum) * time.Microsecond
+	tt := time.Duration(base*burst*cliNum/qps) * time.Microsecond
 	log.Info("begin to run gRPC case", zap.String("case", c.Name()), zap.Int64("qps", qps), zap.Int64("burst", burst), zap.Duration("interval", tt))
 	for _, cli := range c.clients {
 		c.wg.Add(1)
@@ -352,7 +352,7 @@ func (c *etcdController) run() {
 	qps := c.GetQPS()
 	burst := c.GetBurst()
 	cliNum := int64(len(c.clients))
-	tt := time.Duration(base/qps*burst*cliNum) * time.Microsecond
+	tt := time.Duration(base*burst*cliNum/qps) * time.Microsecond
 	log.Info("begin to run etcd case", zap.String("case", c.Name()), zap.Int64("qps", qps), zap.Int64("burst", burst), zap.Duration("interval", tt))
 	err := c.Init(c.ctx, c.clients[0])
 	if err != nil {