QueryFrontend sets incorrect status code on HTTP timeout (cortexproject#2483)

Dmitry Shmulevich · web-flow · commit 93eba69fdf41 · 2020-04-20T08:49:14.000+01:00
* QueryFrontend sets incorrect status code on HTTP timeout

Signed-off-by: Dmitry Shmulevich &lt;dmitry.shmulevich@sysdig.com&gt;

* updated CHANGELOG

Signed-off-by: Dmitry Shmulevich &lt;dmitry.shmulevich@sysdig.com&gt;

* addressed comments

Signed-off-by: Dmitry Shmulevich &lt;dmitry.shmulevich@sysdig.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,6 +43,7 @@
 * [BUGFIX] Ring: Fixed a situation where upgrading from pre-1.0 cortex with a rolling strategy caused new 1.0 ingesters to lose their zone value in the ring until manually forced to re-register. #2404
 * [BUGFIX] Distributor: `/all_user_stats` now show API and Rule Ingest Rate correctly. #2457
 * [BUGFIX] Fixed `version`, `revision` and `branch` labels exported by the `cortex_build_info` metric. #2468
+* [BUGFIX] QueryFrontend: fixed a situation where HTTP error is ignored and an incorrect status code is set. #2483
 
 ## 1.0.0 / 2020-04-02
 
diff --git a/pkg/querier/frontend/frontend.go b/pkg/querier/frontend/frontend.go
@@ -185,7 +185,11 @@ func (f *Frontend) handle(w http.ResponseWriter, r *http.Request) {
 		hs[h] = vs
 	}
 	w.WriteHeader(resp.StatusCode)
-	io.Copy(w, resp.Body)
+
+	if _, err = io.Copy(w, resp.Body); err != nil {
+		server.WriteError(w, err)
+		return
+	}
 }
 
 func writeError(w http.ResponseWriter, err error) {

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,11 @@ func (f Frontend) handle(w http.ResponseWriter, r http.Request) {`
`185`	`185`	`hs[h] = vs`
`186`	`186`	`}`
`187`	`187`	`w.WriteHeader(resp.StatusCode)`
`188`		`- io.Copy(w, resp.Body)`
	`188`	`+`
	`189`	`+ if _, err = io.Copy(w, resp.Body); err != nil {`
	`190`	`+ server.WriteError(w, err)`
	`191`	`+ return`
	`192`	`+ }`
`189`	`193`	`}`
`190`	`194`
`191`	`195`	`func writeError(w http.ResponseWriter, err error) {`