40614d9a7b
Merge in DNS/adguard-home from 2324-querylog-bug-fix to master
Closes #2324.
Squashed commit of the following:
commit fdd584a218e1edc3e45ab5b00ceed0a3be681e32
Merge: 8103f9e42 f2eda6d19
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 18 15:35:42 2020 +0300
Merge branch 'master' into 2324-querylog-bug-fix
commit 8103f9e42a398f43682ee30d09b3afdab0e9e177
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 18 14:28:29 2020 +0300
querylog: fix the file ordering bug
commit 2c4e8fcc5b8593be1614480508dfd600fc676e64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 17 20:57:45 2020 +0300
querylog: wrap errors to clarify error trace
commit 3733062b494817696e4443f153774bb01cea1b06
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 17 18:55:17 2020 +0300
querylog: fix logger output bug
269 lines
5.2 KiB
Go
269 lines
5.2 KiB
Go
package querylog
|
|
|
|
import (
|
|
"errors"
|
|
"io"
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestQLogReaderEmpty(t *testing.T) {
|
|
r, err := NewQLogReader([]string{})
|
|
assert.Nil(t, err)
|
|
assert.NotNil(t, r)
|
|
defer r.Close()
|
|
|
|
// seek to the start
|
|
err = r.SeekStart()
|
|
assert.Nil(t, err)
|
|
|
|
line, err := r.ReadNext()
|
|
assert.Equal(t, "", line)
|
|
assert.Equal(t, io.EOF, err)
|
|
}
|
|
|
|
func TestQLogReaderOneFile(t *testing.T) {
|
|
// let's do one small file
|
|
count := 10
|
|
filesCount := 1
|
|
|
|
testDir := prepareTestDir()
|
|
defer func() { _ = os.RemoveAll(testDir) }()
|
|
testFiles := prepareTestFiles(testDir, filesCount, count)
|
|
|
|
r, err := NewQLogReader(testFiles)
|
|
assert.Nil(t, err)
|
|
assert.NotNil(t, r)
|
|
defer r.Close()
|
|
|
|
// seek to the start
|
|
err = r.SeekStart()
|
|
assert.Nil(t, err)
|
|
|
|
// read everything
|
|
read := 0
|
|
var line string
|
|
for err == nil {
|
|
line, err = r.ReadNext()
|
|
if err == nil {
|
|
assert.True(t, len(line) > 0)
|
|
read += 1
|
|
}
|
|
}
|
|
|
|
assert.Equal(t, count*filesCount, read)
|
|
assert.Equal(t, io.EOF, err)
|
|
}
|
|
|
|
func TestQLogReaderMultipleFiles(t *testing.T) {
|
|
// should be large enough
|
|
count := 10000
|
|
filesCount := 5
|
|
|
|
testDir := prepareTestDir()
|
|
defer func() { _ = os.RemoveAll(testDir) }()
|
|
testFiles := prepareTestFiles(testDir, filesCount, count)
|
|
|
|
r, err := NewQLogReader(testFiles)
|
|
assert.Nil(t, err)
|
|
assert.NotNil(t, r)
|
|
defer r.Close()
|
|
|
|
// seek to the start
|
|
err = r.SeekStart()
|
|
assert.Nil(t, err)
|
|
|
|
// read everything
|
|
read := 0
|
|
var line string
|
|
for err == nil {
|
|
line, err = r.ReadNext()
|
|
if err == nil {
|
|
assert.True(t, len(line) > 0)
|
|
read += 1
|
|
}
|
|
}
|
|
|
|
assert.Equal(t, count*filesCount, read)
|
|
assert.Equal(t, io.EOF, err)
|
|
}
|
|
|
|
func TestQLogReader_Seek(t *testing.T) {
|
|
count := 10000
|
|
filesCount := 2
|
|
|
|
testDir := prepareTestDir()
|
|
t.Cleanup(func() {
|
|
_ = os.RemoveAll(testDir)
|
|
})
|
|
testFiles := prepareTestFiles(testDir, filesCount, count)
|
|
|
|
r, err := NewQLogReader(testFiles)
|
|
assert.Nil(t, err)
|
|
assert.NotNil(t, r)
|
|
t.Cleanup(func() {
|
|
_ = r.Close()
|
|
})
|
|
|
|
testCases := []struct {
|
|
name string
|
|
time string
|
|
want error
|
|
}{{
|
|
name: "not_too_old",
|
|
time: "2020-02-19T04:04:56.920973+03:00",
|
|
want: nil,
|
|
}, {
|
|
name: "old",
|
|
time: "2020-02-19T01:28:16.920973+03:00",
|
|
want: nil,
|
|
}, {
|
|
name: "first",
|
|
time: "2020-02-19T04:09:55.920973+03:00",
|
|
want: nil,
|
|
}, {
|
|
name: "last",
|
|
time: "2020-02-19T01:23:16.920973+03:00",
|
|
want: nil,
|
|
}, {
|
|
name: "non-existent_long_ago",
|
|
time: "2000-02-19T01:23:16.920973+03:00",
|
|
want: ErrSeekNotFound,
|
|
}, {
|
|
name: "non-existent_far_ahead",
|
|
time: "2100-02-19T01:23:16.920973+03:00",
|
|
want: ErrEndOfLog,
|
|
}, {
|
|
name: "non-existent_but_could",
|
|
time: "2020-02-19T03:00:00.000000+03:00",
|
|
want: ErrSeekNotFound,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
timestamp, err := time.Parse(time.RFC3339Nano, tc.time)
|
|
assert.Nil(t, err)
|
|
|
|
err = r.Seek(timestamp.UnixNano())
|
|
assert.True(t, errors.Is(err, tc.want), err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestQLogReader_ReadNext(t *testing.T) {
|
|
count := 10
|
|
filesCount := 1
|
|
|
|
testDir := prepareTestDir()
|
|
t.Cleanup(func() {
|
|
_ = os.RemoveAll(testDir)
|
|
})
|
|
testFiles := prepareTestFiles(testDir, filesCount, count)
|
|
|
|
r, err := NewQLogReader(testFiles)
|
|
assert.Nil(t, err)
|
|
assert.NotNil(t, r)
|
|
t.Cleanup(func() {
|
|
_ = r.Close()
|
|
})
|
|
|
|
testCases := []struct {
|
|
name string
|
|
start int
|
|
want error
|
|
}{{
|
|
name: "ok",
|
|
start: 0,
|
|
want: nil,
|
|
}, {
|
|
name: "too_big",
|
|
start: count + 1,
|
|
want: io.EOF,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
err := r.SeekStart()
|
|
assert.Nil(t, err, err)
|
|
|
|
for i := 1; i < tc.start; i++ {
|
|
_, err := r.ReadNext()
|
|
assert.Nil(t, err)
|
|
}
|
|
|
|
_, err = r.ReadNext()
|
|
assert.Equal(t, tc.want, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
// TODO(e.burkov): Remove the tests below. Make tests above more compelling.
|
|
func TestQLogReaderSeek(t *testing.T) {
|
|
// more or less big file
|
|
count := 10000
|
|
filesCount := 2
|
|
|
|
testDir := prepareTestDir()
|
|
defer func() { _ = os.RemoveAll(testDir) }()
|
|
testFiles := prepareTestFiles(testDir, filesCount, count)
|
|
|
|
r, err := NewQLogReader(testFiles)
|
|
assert.Nil(t, err)
|
|
assert.NotNil(t, r)
|
|
defer r.Close()
|
|
|
|
// CASE 1: NOT TOO OLD LINE
|
|
testSeekLineQLogReader(t, r, 300)
|
|
|
|
// CASE 2: OLD LINE
|
|
testSeekLineQLogReader(t, r, count-300)
|
|
|
|
// CASE 3: FIRST LINE
|
|
testSeekLineQLogReader(t, r, 0)
|
|
|
|
// CASE 4: LAST LINE
|
|
testSeekLineQLogReader(t, r, count)
|
|
|
|
// CASE 5: Seek non-existent (too low)
|
|
err = r.Seek(123)
|
|
assert.NotNil(t, err)
|
|
|
|
// CASE 6: Seek non-existent (too high)
|
|
ts, _ := time.Parse(time.RFC3339, "2100-01-02T15:04:05Z07:00")
|
|
err = r.Seek(ts.UnixNano())
|
|
assert.NotNil(t, err)
|
|
}
|
|
|
|
func testSeekLineQLogReader(t *testing.T, r *QLogReader, lineNumber int) {
|
|
line, err := getQLogReaderLine(r, lineNumber)
|
|
assert.Nil(t, err)
|
|
ts := readQLogTimestamp(line)
|
|
assert.NotEqual(t, uint64(0), ts)
|
|
|
|
// try seeking to that line now
|
|
err = r.Seek(ts)
|
|
assert.Nil(t, err)
|
|
|
|
testLine, err := r.ReadNext()
|
|
assert.Nil(t, err)
|
|
assert.Equal(t, line, testLine)
|
|
}
|
|
|
|
func getQLogReaderLine(r *QLogReader, lineNumber int) (string, error) {
|
|
err := r.SeekStart()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
for i := 1; i < lineNumber; i++ {
|
|
_, err := r.ReadNext()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
}
|
|
return r.ReadNext()
|
|
}
|