Merge pull request #5887 from influxdata/jl-http-keepalive

Don't close HTTP Connections
2016-03-02 13:45:01 -05:00 · 2016-03-02 13:45:01 -05:00 · 77513a57b5
parent b39c35c5c4 92955fa701
commit 77513a57b5
2 changed files with 2 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -52,6 +52,7 @@
 - [#5842](https://github.com/influxdata/influxdb/issues/5842): Add SeriesList binary marshaling
 - [#5854](https://github.com/influxdata/influxdb/issues/5854): failures of tests in tsdb/engine/tsm1 when compiled with go master
 - [#5610](https://github.com/influxdata/influxdb/issues/5610): Write into fully-replicated cluster is not replicated across all shards
+- [#5880](https://github.com/influxdata/influxdb/issues/5880): TCP connection closed after write (regression/change from 0.9.6)

 ## v0.10.1 [2016-02-18]

--- a/services/httpd/handler.go
+++ b/services/httpd/handler.go
@ -385,9 +385,9 @@ func (h *Handler) serveWrite(w http.ResponseWriter, r *http.Request, user *meta.
 			resultError(w, influxql.Result{Err: err}, http.StatusBadRequest)
 			return
 		}
+		defer b.Close()
 		body = b
 	}
-	defer body.Close()

 	b, err := ioutil.ReadAll(body)
 	if err != nil {