tikv
/
client-go
mirror of https://github.com/tikv/client-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*: make grpc request duration more accurate (#253) 

Signed-off-by: Shuaipeng Yu <jackysp@gmail.com>
This commit is contained in:
Jack Yu 2021-07-27 20:09:05 +08:00 committed by GitHub
parent 1279692fc2
commit 55155ad2e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/client/client.go
View File

@ -353,15 +353,6 @@ func (c *RPCClient) SendRequest(ctx context.Context, addr string, req *tikvrpc.R
} }
start := time.Now() start := time.Now()
defer func() {
stmtExec := ctx.Value(util.ExecDetailsKey)
if stmtExec != nil {
detail := stmtExec.(*util.ExecDetails)
atomic.AddInt64(&detail.WaitKVRespDuration, int64(time.Since(start)))
}
c.updateTiKVSendReqHistogram(req, start)
}()
if atomic.CompareAndSwapUint32(&c.idleNotify, 1, 0) { if atomic.CompareAndSwapUint32(&c.idleNotify, 1, 0) {
c.recycleMu.Lock() c.recycleMu.Lock()
c.recycleIdleConnArray() c.recycleIdleConnArray()
@ -376,6 +367,17 @@ func (c *RPCClient) SendRequest(ctx context.Context, addr string, req *tikvrpc.R
if err != nil { if err != nil {
return nil, errors.Trace(err) return nil, errors.Trace(err)
} }
metrics.TiKVBatchClientRecycle.Observe(time.Since(start).Seconds())
start = time.Now()
defer func() {
stmtExec := ctx.Value(util.ExecDetailsKey)
if stmtExec != nil {
detail := stmtExec.(*util.ExecDetails)
atomic.AddInt64(&detail.WaitKVRespDuration, int64(time.Since(start)))
}
c.updateTiKVSendReqHistogram(req, start)
}()
// TiDB RPC server supports batch RPC, but batch connection will send heart beat, It's not necessary since // TiDB RPC server supports batch RPC, but batch connection will send heart beat, It's not necessary since
// request to TiDB is not high frequency. // request to TiDB is not high frequency.

11
metrics/metrics.go
View File

@ -63,6 +63,7 @@ var (
TiKVBatchRequests *prometheus.HistogramVec TiKVBatchRequests *prometheus.HistogramVec
TiKVBatchClientUnavailable prometheus.Histogram TiKVBatchClientUnavailable prometheus.Histogram
TiKVBatchClientWaitEstablish prometheus.Histogram TiKVBatchClientWaitEstablish prometheus.Histogram
TiKVBatchClientRecycle prometheus.Histogram
TiKVRangeTaskStats *prometheus.GaugeVec TiKVRangeTaskStats *prometheus.GaugeVec
TiKVRangeTaskPushDuration *prometheus.HistogramVec TiKVRangeTaskPushDuration *prometheus.HistogramVec
TiKVTokenWaitDuration prometheus.Histogram TiKVTokenWaitDuration prometheus.Histogram
@ -316,6 +317,15 @@ func initMetrics(namespace, subsystem string) {
Help: "batch client wait new connection establish", Help: "batch client wait new connection establish",
}) })
TiKVBatchClientRecycle = prometheus.NewHistogram(
prometheus.HistogramOpts{
Namespace: namespace,
Subsystem: subsystem,
Name: "batch_client_reset",
Buckets: prometheus.ExponentialBuckets(0.001, 2, 28), // 1ms ~ 1.5days
Help: "batch client recycle connection and reconnect duration",
})
TiKVRangeTaskStats = prometheus.NewGaugeVec( TiKVRangeTaskStats = prometheus.NewGaugeVec(
prometheus.GaugeOpts{ prometheus.GaugeOpts{
Namespace: namespace, Namespace: namespace,
@ -547,6 +557,7 @@ func RegisterMetrics() {
prometheus.MustRegister(TiKVBatchRequests) prometheus.MustRegister(TiKVBatchRequests)
prometheus.MustRegister(TiKVBatchClientUnavailable) prometheus.MustRegister(TiKVBatchClientUnavailable)
prometheus.MustRegister(TiKVBatchClientWaitEstablish) prometheus.MustRegister(TiKVBatchClientWaitEstablish)
prometheus.MustRegister(TiKVBatchClientRecycle)
prometheus.MustRegister(TiKVRangeTaskStats) prometheus.MustRegister(TiKVRangeTaskStats)
prometheus.MustRegister(TiKVRangeTaskPushDuration) prometheus.MustRegister(TiKVRangeTaskPushDuration)
prometheus.MustRegister(TiKVTokenWaitDuration) prometheus.MustRegister(TiKVTokenWaitDuration)