Merge branch 'master' into fix-move-peer

tikv · May 12, 2021 · 7c7b62a · 7c7b62a
2 parents ad4720a + 1faef48
commit 7c7b62a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/server/api/member_test.go b/server/api/member_test.go
@@ -148,6 +148,7 @@ func changeLeaderPeerUrls(c *C, leader *pdpb.Member, id uint64, urls []string) {
 	resp, err := testDialClient.Do(req)
 	c.Assert(err, IsNil)
 	c.Assert(resp.StatusCode, Equals, 204)
+	resp.Body.Close()
 }
 
 type testResignAPISuite struct {

diff --git a/server/server.go b/server/server.go
@@ -1337,6 +1337,8 @@ func (s *Server) ReplicateFileToAllMembers(ctx context.Context, name string, dat
 			log.Warn("failed to replicate file", zap.String("name", name), zap.String("member", member.GetName()), errs.ZapError(err))
 			return errs.ErrSendRequest.Wrap(err).GenWithStackByCause()
 		}
+		// Since we don't read the body, we can close it immediately.
+		res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			log.Warn("failed to replicate file", zap.String("name", name), zap.String("member", member.GetName()), zap.Int("status-code", res.StatusCode))
 			return errs.ErrSendRequest.FastGenByArgs()