Browse Source

rafthttp: fix httputil.RequestCanceler

Gyu-Ho Lee 9 years ago
parent
commit
0503676bde
3 changed files with 3 additions and 3 deletions
  1. 1 1
      rafthttp/pipeline.go
  2. 1 1
      rafthttp/snapshot_sender.go
  3. 1 1
      rafthttp/stream.go

+ 1 - 1
rafthttp/pipeline.go

@@ -117,7 +117,7 @@ func (p *pipeline) post(data []byte) (err error) {
 	req := createPostRequest(u, RaftPrefix, bytes.NewBuffer(data), "application/protobuf", p.tr.URLs, p.tr.ID, p.tr.ClusterID)
 
 	done := make(chan struct{}, 1)
-	cancel := httputil.RequestCanceler(p.tr.pipelineRt, req)
+	cancel := httputil.RequestCanceler(req)
 	go func() {
 		select {
 		case <-done:

+ 1 - 1
rafthttp/snapshot_sender.go

@@ -103,7 +103,7 @@ func (s *snapshotSender) send(merged snap.Message) {
 // post posts the given request.
 // It returns nil when request is sent out and processed successfully.
 func (s *snapshotSender) post(req *http.Request) (err error) {
-	cancel := httputil.RequestCanceler(s.tr.pipelineRt, req)
+	cancel := httputil.RequestCanceler(req)
 
 	type responseAndError struct {
 		resp *http.Response

+ 1 - 1
rafthttp/stream.go

@@ -413,7 +413,7 @@ func (cr *streamReader) dial(t streamType) (io.ReadCloser, error) {
 		return nil, fmt.Errorf("stream reader is stopped")
 	default:
 	}
-	cr.cancel = httputil.RequestCanceler(cr.tr.streamRt, req)
+	cr.cancel = httputil.RequestCanceler(req)
 	cr.mu.Unlock()
 
 	resp, err := cr.tr.streamRt.RoundTrip(req)