fix goroutine leak

Signed-off-by: lance6716 <lance6716@gmail.com>

integration_tests/pd_api_test.go

@@ -205,7 +205,7 @@ func (s *apiTestSuite) TestInitClusterMinResolvedTSZero() {
 
 func (s *apiTestSuite) TearDownTest() {
 	if s.store != nil {
-		s.Require().Nil(s.store.Close())
+		s.Require().NoError(s.store.Close())
 	}
 	s.Require().NoError(failpoint.Disable("tikvclient/mockFastSafeTSUpdater"))
 }

tikv/kv.go

@@ -198,12 +198,20 @@ func WithPDHTTPClient(
 	opts ...pdhttp.ClientOption,
 ) Option {
 	return func(o *KVStore) {
+		if cli := o.GetPDClient(); cli != nil {
+			o.pdHttpClient = pdhttp.NewClientWithServiceDiscovery(
+				source,
+				o.pdClient.GetServiceDiscovery(),
+				opts...,
+			)
+		} else {
 			o.pdHttpClient = pdhttp.NewClient(
 				source,
 				pdAddrs,
 				opts...,
 			)
 		}
+	}
 }
 
 // loadOption load KVStore option into KVStore.