Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

live-tailing: preload all the historic entries before query context is cancelled #862

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions pkg/iter/iterator.go
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,18 @@ type entryIteratorForward struct {

// NewEntryIteratorBackward returns an iterator which loads all or upton N entries
// of an existing iterator, and then iterates over them backward.
func NewEntryIteratorForward(it EntryIterator, limit uint32) (EntryIterator, error) {
return &entryIteratorForward{entriesWithLabels: make([]entryWithLabels, 0, 1024), backwardIter: it, limit: limit}, it.Error()
// preload entries when they are being queried with a timeout
func NewEntryIteratorForward(it EntryIterator, limit uint32, preload bool) (EntryIterator, error) {
itr, err := &entryIteratorForward{entriesWithLabels: make([]entryWithLabels, 0, 1024), backwardIter: it, limit: limit}, it.Error()
if err != nil {
return nil, err
}

if preload {
itr.load()
}

return itr, nil
}

func (i *entryIteratorForward) load() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/iter/iterator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ func TestEntryIteratorForward(t *testing.T) {
itr2 := mkStreamIterator(inverse(offset(testSize, identity)), "{foobar: \"bazbar\"}")

heapIterator := NewHeapIterator([]EntryIterator{itr1, itr2}, logproto.BACKWARD)
forwardIterator, err := NewEntryIteratorForward(heapIterator, testSize)
forwardIterator, err := NewEntryIteratorForward(heapIterator, testSize, false)
require.NoError(t, err)

for i := int64((testSize / 2) + 1); i <= testSize; i++ {
Expand Down
2 changes: 1 addition & 1 deletion pkg/querier/querier.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func (q *Querier) Tail(ctx context.Context, req *logproto.TailRequest) (*Tailer,
return nil, err
}

reversedIterator, err := iter.NewEntryIteratorForward(iter.NewHeapIterator(histIterators, logproto.BACKWARD), req.Limit)
reversedIterator, err := iter.NewEntryIteratorForward(iter.NewHeapIterator(histIterators, logproto.BACKWARD), req.Limit, true)
if err != nil {
return nil, err
}
Expand Down