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

Catch context error when getting bucket index #5935

Merged
merged 2 commits into from
May 8, 2024
Merged

Catch context error when getting bucket index #5935

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8aa350a
Catch context error when getting bucket index
wilguo May 8, 2024
232800a
change logger
wilguo May 8, 2024
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
6 changes: 6 additions & 0 deletions pkg/storage/tsdb/bucketindex/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

"github.com/cortexproject/cortex/pkg/storage/bucket"
"github.com/cortexproject/cortex/pkg/util"
util_log "github.com/cortexproject/cortex/pkg/util/log"
"github.com/cortexproject/cortex/pkg/util/services"
)

Expand Down Expand Up @@ -92,6 +93,11 @@ func NewLoader(cfg LoaderConfig, bucketClient objstore.Bucket, cfgProvider bucke
// GetIndex returns the bucket index for the given user. It returns the in-memory cached
// index if available, or load it from the bucket otherwise.
func (l *Loader) GetIndex(ctx context.Context, userID string) (*Index, Status, error) {
if ctx.Err() != nil {
level.Warn(util_log.WithContext(ctx, l.logger)).Log("msg", "received context error when attempting to load bucket index", "err", ctx.Err())
return nil, UnknownStatus, ctx.Err()
}

l.indexesMx.RLock()
if entry := l.indexes[userID]; entry != nil {
idx := entry.index
Expand Down
Loading