lib/protoparser: handle unexpected EOF error when parsing lines in prometheus exposition format (#4851)

Previously only io.EOF was handled, and io.ErrUnexpectedEOF was ignored, but it may happen if the client interrupts the connection.

https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4817
This commit is contained in:
Dmytro Kozlov 2023-08-18 08:55:42 +02:00 committed by Aliaksandr Valialkin
parent a5df1e2525
commit 3c5bff2ffa
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
2 changed files with 28 additions and 1 deletions

View file

@ -93,7 +93,7 @@ again:
}
func isEOFLikeError(err error) bool {
if errors.Is(err, io.EOF) {
if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
return true
}
s := err.Error()

View file

@ -2,6 +2,7 @@ package common
import (
"bytes"
"errors"
"fmt"
"io"
"reflect"
@ -25,6 +26,20 @@ func TestReadLinesBlockFailure(t *testing.T) {
if _, _, err := ReadLinesBlock(fr, nil, nil); err == nil {
t.Fatalf("expecting non-nil error")
}
un := &unexpectedEOF{}
if _, _, err := ReadLinesBlock(un, nil, nil); err != nil {
if !errors.Is(err, io.EOF) {
t.Fatalf("get unexpected error, expecting io.EOF")
}
}
ef := eofErr{}
if _, _, err := ReadLinesBlock(ef, nil, nil); err != nil {
if !errors.Is(err, io.EOF) {
t.Fatalf("get unexpected error, expecting io.EOF")
}
}
}
// empty string
@ -41,6 +56,18 @@ func (fr *failureReader) Read(p []byte) (int, error) {
return 0, fmt.Errorf("some error")
}
type unexpectedEOF struct{}
func (un unexpectedEOF) Read(p []byte) (int, error) {
return 0, io.ErrUnexpectedEOF
}
type eofErr struct{}
func (eo eofErr) Read(p []byte) (int, error) {
return 0, io.EOF
}
func TestReadLinesBlockMultiLinesSingleByteReader(t *testing.T) {
f := func(s string, linesExpected []string) {
t.Helper()