Skip to content

Commit

Permalink
fix: data race / nil channel read in pattern aggregation push (#15410)
Browse files Browse the repository at this point in the history
  • Loading branch information
na-- authored Dec 13, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent bc3d994 commit 5d8220c
Showing 2 changed files with 10 additions and 5 deletions.
14 changes: 9 additions & 5 deletions pkg/pattern/aggregation/push.go
Original file line number Diff line number Diff line change
@@ -59,8 +59,9 @@ type Push struct {
contentType string
logger log.Logger

// shutdown channels
quit chan struct{}
running sync.WaitGroup
quit chan struct{}
quitOnce sync.Once

// auth
username, password string
@@ -149,6 +150,7 @@ func NewPush(
metrics: metrics,
}

p.running.Add(1)
go p.run(pushPeriod)
return p, nil
}
@@ -160,10 +162,10 @@ func (p *Push) WriteEntry(ts time.Time, e string, lbls labels.Labels) {

// Stop will cancel any ongoing requests and stop the goroutine listening for requests
func (p *Push) Stop() {
if p.quit != nil {
p.quitOnce.Do(func() {
close(p.quit)
p.quit = nil
}
})
p.running.Wait()
}

// buildPayload creates the snappy compressed protobuf to send to Loki
@@ -244,6 +246,8 @@ func (p *Push) buildPayload(ctx context.Context) ([]byte, error) {

// run pulls lines out of the channel and sends them to Loki
func (p *Push) run(pushPeriod time.Duration) {
defer p.running.Done()

ctx, cancel := context.WithCancel(context.Background())
pushTicker := time.NewTimer(pushPeriod)
defer pushTicker.Stop()
1 change: 1 addition & 0 deletions pkg/pattern/aggregation/push_test.go
Original file line number Diff line number Diff line change
@@ -169,6 +169,7 @@ func Test_Push(t *testing.T) {
lbls2,
)

p.running.Add(1)
go p.run(time.Nanosecond)

select {

0 comments on commit 5d8220c

Please sign in to comment.