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.

Sign up for GitHub

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

fix: server panics during shutdown with reporting metrics: failed to store jobs: context canceled #4228

Merged
merged 2 commits into from
Dec 12, 2023
Merged

fix: server panics during shutdown with reporting metrics: failed to store jobs: context canceled #4228

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c07e17a
fix: server panics during shutdown with reporting metrics: failed to …
atzoum Dec 12, 2023
fec2d8d
fixup! fix: server panics during shutdown with reporting metrics: fai…
atzoum Dec 12, 2023
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
5 changes: 3 additions & 2 deletions enterprise/reporting/error_index/error_index_reporting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ func NewErrorIndexReporter(ctx context.Context, log logger.Logger, configSubscri

// Report reports the metrics to the errorIndex JobsDB
func (eir *ErrorIndexReporter) Report(metrics []*types.PUReportedMetric, tx *Tx) error {
ctx := context.TODO() // TODO: add context to the Report method
failedAt := eir.now()

var jobs []*jobsdb.JobT
Expand Down Expand Up @@ -171,8 +172,8 @@ func (eir *ErrorIndexReporter) Report(metrics []*types.PUReportedMetric, tx *Tx)
if err != nil {
return fmt.Errorf("failed to resolve jobsdb: %w", err)
}
if err := db.WithStoreSafeTxFromTx(eir.ctx, tx, func(tx jobsdb.StoreSafeTx) error {
return db.StoreInTx(eir.ctx, tx, jobs)
if err := db.WithStoreSafeTxFromTx(ctx, tx, func(tx jobsdb.StoreSafeTx) error {
return db.StoreInTx(ctx, tx, jobs)
}); err != nil {
return fmt.Errorf("failed to store jobs: %w", err)
}
Expand Down
Loading