github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-02-09 15:27:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

app/vminsert: properly read trailing line without newline in the end

Browse source 
This fixes https://github.com/VictoriaMetrics/VictoriaMetrics/issues/60
This commit is contained in:
Aliaksandr Valialkin 2019-06-07 23:17:57 +03:00
parent 0371c216a7
commit 0b78d228d2
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/vminsert/common/lines_reader.go
View file

@ -20,6 +20,7 @@ const defaultBlockSize = 64 * 1024
// //
// Returns (dstBuf, tailBuf). // Returns (dstBuf, tailBuf).
func ReadLinesBlock(r io.Reader, dstBuf, tailBuf []byte) ([]byte, []byte, error) { func ReadLinesBlock(r io.Reader, dstBuf, tailBuf []byte) ([]byte, []byte, error) {
origDstBufLen := len(dstBuf)
if cap(dstBuf) < defaultBlockSize { if cap(dstBuf) < defaultBlockSize {
dstBuf = bytesutil.Resize(dstBuf, defaultBlockSize) dstBuf = bytesutil.Resize(dstBuf, defaultBlockSize)
} }
@ -32,6 +33,13 @@ again:
if err == nil { if err == nil {
return dstBuf, tailBuf, fmt.Errorf("no forward progress made") return dstBuf, tailBuf, fmt.Errorf("no forward progress made")
} }
if err == io.EOF && len(dstBuf) > origDstBufLen {
// Missing newline in the end of stream. This is OK,
/// so suppress io.EOF for now. It will be returned during the next
// call to ReadLinesBlock.
// This fixes https://github.com/VictoriaMetrics/VictoriaMetrics/issues/60 .
return dstBuf, tailBuf, nil
}
return dstBuf, tailBuf, err return dstBuf, tailBuf, err
} }
dstBuf = dstBuf[:len(dstBuf)+n] dstBuf = dstBuf[:len(dstBuf)+n]

3
app/vminsert/common/lines_reader_test.go
View file

@ -29,9 +29,6 @@ func TestReadLinesBlockFailure(t *testing.T) {
// empty string // empty string
f("") f("")
// no newline in nonempty string
f("foobar")
// too long string // too long string
b := make([]byte, maxLineSize+1) b := make([]byte, maxLineSize+1)
f(string(b)) f(string(b))