Resolve the conflicts

Signed-off-by: JmPotato <[email protected]>
tikv · Aug 1, 2024 · 97da4ea · 97da4ea
1 parent c8d08d2
commit 97da4ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/utils/apiutil/serverapi/middleware.go b/pkg/utils/apiutil/serverapi/middleware.go
@@ -264,7 +264,7 @@ func (h *redirector) waitForLeader(r *http.Request) (leader *pdpb.Member) {
 			}
 		case <-r.Context().Done():
 			return
-		case <-h.s.LoopContext().Done():
+		case <-h.s.Context().Done():
 			return
 		}
 	}

diff --git a/tests/server/api/api_test.go b/tests/server/api/api_test.go
@@ -611,9 +611,10 @@ func (suite *redirectorTestSuite) TestRedirect() {
 	err := leader.ResignLeader()
 	re.NoError(err)
 	for _, svr := range suite.cluster.GetServers() {
-		url := fmt.Sprintf("%s/pd/api/v1/version", svr.GetServer().GetAddr())
+		request, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/pd/api/v1/version", svr.GetServer().GetAddr()), http.NoBody)
+		re.NoError(err)
 		testutil.Eventually(re, func() bool {
-			resp, err := tests.TestDialClient.Get(url)
+			resp, err := dialClient.Do(request)
 			re.NoError(err)
 			defer resp.Body.Close()
 			_, err = io.ReadAll(resp.Body)