From 5518f8bd8e3ef73a31b44e1a252158361fb1745f Mon Sep 17 00:00:00 2001 From: Song Gao Date: Tue, 2 Nov 2021 20:38:51 +0800 Subject: [PATCH] *: update client-go and fix metrics (#29354) --- go.mod | 2 +- go.sum | 4 ++-- store/copr/coprocessor.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 3ebebdccdd3d2..80da5b02a195c 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 - github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211101035952-9ec50224bea6 + github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211102120533-b8cc5a319d96 github.com/tikv/pd v1.1.0-beta.0.20211029083450-e65f0c55b6ae github.com/twmb/murmur3 v1.1.3 github.com/uber/jaeger-client-go v2.22.1+incompatible diff --git a/go.sum b/go.sum index b31db80825f54..5f8986c248e64 100644 --- a/go.sum +++ b/go.sum @@ -712,8 +712,8 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfK github.com/tidwall/gjson v1.3.5/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211101035952-9ec50224bea6 h1:hRn82rVDw91KBSoMT7eAv8qPIxFMU6+f5K35fP5ULbY= -github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211101035952-9ec50224bea6/go.mod h1:iiwtsCxcbNLK5i9VRYGvdcihgHXTKy2ukWjoaJsrphg= +github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211102120533-b8cc5a319d96 h1:+PffHhOZm7OpC+VrL10ahT/KwloECT4ZtSJ0D8SzmYQ= +github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211102120533-b8cc5a319d96/go.mod h1:iiwtsCxcbNLK5i9VRYGvdcihgHXTKy2ukWjoaJsrphg= github.com/tikv/pd v1.1.0-beta.0.20211029083450-e65f0c55b6ae h1:PmnkhiOopgMZYDQ7Htj1kt/zwW4MEOUL+Dem6WLZISY= github.com/tikv/pd v1.1.0-beta.0.20211029083450-e65f0c55b6ae/go.mod h1:varH0IE0jJ9E9WN2Ei/N6pajMlPkcXdDEf7f5mmsUVQ= github.com/tklauser/go-sysconf v0.3.4 h1:HT8SVixZd3IzLdfs/xlpq0jeSfTX57g1v6wB1EuzV7M= diff --git a/store/copr/coprocessor.go b/store/copr/coprocessor.go index a2a8ce5e5b9a8..77fbd2a90a6e9 100644 --- a/store/copr/coprocessor.go +++ b/store/copr/coprocessor.go @@ -723,6 +723,7 @@ func (worker *copIteratorWorker) handleTaskOnce(bo *Backoffer, task *copTask, ch if worker.req.IsStaleness { req.EnableStaleRead() } + staleRead := req.GetStaleRead() ops := make([]tikv.StoreSelectorOption, 0, 2) if len(worker.req.MatchStoreLabels) > 0 { ops = append(ops, tikv.WithMatchLabels(worker.req.MatchStoreLabels)) @@ -744,8 +745,7 @@ func (worker *copIteratorWorker) handleTaskOnce(bo *Backoffer, task *copTask, ch worker.logTimeCopTask(costTime, task, bo, resp) } storeID := strconv.FormatUint(req.Context.GetPeer().GetStoreId(), 10) - staleRead := strconv.FormatBool(req.StaleRead) - metrics.TiKVCoprocessorHistogram.WithLabelValues(storeID, staleRead).Observe(costTime.Seconds()) + metrics.TiKVCoprocessorHistogram.WithLabelValues(storeID, strconv.FormatBool(staleRead)).Observe(costTime.Seconds()) if task.cmdType == tikvrpc.CmdCopStream { return worker.handleCopStreamResult(bo, rpcCtx, resp.Resp.(*tikvrpc.CopStreamResponse), task, ch, costTime)