order import

Signed-off-by: husharp <[email protected]>

Author: HuSharp

integration_tests/pd_api_test.go

@@ -37,16 +37,16 @@ package tikv_test
 import (
 	"context"
 	"fmt"
-	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/tikv/client-go/v2/config"
 	"strings"
 	"sync/atomic"
 	"testing"
 	"time"
 
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
+	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/stretchr/testify/suite"
+	"github.com/tikv/client-go/v2/config"
 	"github.com/tikv/client-go/v2/oracle"
 	"github.com/tikv/client-go/v2/tikv"
 	"github.com/tikv/client-go/v2/tikvrpc"

tikv/kv.go

@@ -542,12 +542,6 @@ func (s *KVStore) safeTSUpdater() {
 	}
 }
 
-var (
-	skipSafeTSUpdateCounter    = metrics.TiKVSafeTSUpdateCounter.WithLabelValues("skip", "cluster")
-	successSafeTSUpdateCounter = metrics.TiKVSafeTSUpdateCounter.WithLabelValues("success", "cluster")
-	clusterMinSafeTSGap        = metrics.TiKVMinSafeTSGapSeconds.WithLabelValues("cluster")
-)
-
 func (s *KVStore) updateSafeTS(ctx context.Context) {
 	// Try getting the cluster-level minimum resolved timestamp from PD first.
 	if s.setGlobalMinSafeTSByPD(ctx) {
@@ -614,6 +608,12 @@ func (s *KVStore) updateSafeTS(ctx context.Context) {
 	wg.Wait()
 }
 
+var (
+	skipSafeTSUpdateCounter    = metrics.TiKVSafeTSUpdateCounter.WithLabelValues("skip", "cluster")
+	successSafeTSUpdateCounter = metrics.TiKVSafeTSUpdateCounter.WithLabelValues("success", "cluster")
+	clusterMinSafeTSGap        = metrics.TiKVMinSafeTSGapSeconds.WithLabelValues("cluster")
+)
+
 // setGlobalMinSafeTSByPD check whether it is needed to get cluster-level's min resolved ts from PD.
 func (s *KVStore) setGlobalMinSafeTSByPD(ctx context.Context) bool {
 	isGlobal := config.GetTxnScopeFromConfig() == oracle.GlobalTxnScope