Skip to content

Fix sync bucket index status #5519

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

Merged
merged 1 commit into from
Aug 21, 2023
Merged

Fix sync bucket index status #5519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions pkg/storage/tsdb/bucketindex/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,19 @@ func (l *Loader) GetIndex(ctx context.Context, userID string) (*Index, Status, e
}
l.indexesMx.RUnlock()

ss, err := ReadSyncStatus(ctx, l.bkt, userID, l.logger)

if err != nil {
level.Warn(l.logger).Log("msg", "unable to read bucket index status", "user", userID, "err", err)
}

startTime := time.Now()
l.loadAttempts.Inc()
idx, err := ReadIndex(ctx, l.bkt, userID, l.cfgProvider, l.logger)
if err != nil {
// Cache the error, to avoid hammering the object store in case of persistent issues
// (eg. corrupted bucket index or not existing).
l.cacheIndex(userID, nil, UnknownStatus, err)
l.cacheIndex(userID, nil, ss, err)

if errors.Is(err, ErrIndexNotFound) {
level.Warn(l.logger).Log("msg", "bucket index not found", "user", userID)
Expand All @@ -124,13 +130,7 @@ func (l *Loader) GetIndex(ctx context.Context, userID string) (*Index, Status, e
level.Error(l.logger).Log("msg", "unable to load bucket index", "user", userID, "err", err)
}

return nil, UnknownStatus, err
}

ss, err := ReadSyncStatus(ctx, l.bkt, userID, l.logger)

if err != nil {
level.Warn(l.logger).Log("msg", "unable to read bucket index status", "user", userID, "err", err)
return nil, ss, err
}

// Cache the index.
Expand Down
20 changes: 18 additions & 2 deletions pkg/storage/tsdb/bucketindex/loader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ func TestLoader_ShouldOffloadIndexIfIdleTimeoutIsReachedDuringBackgroundUpdates(
))
}

func TestLoader_ShouldUpdateIndexInBackgroundOnPreviousKeyAcessDenied(t *testing.T) {
func TestLoader_ShouldUpdateIndexInBackgroundOnPreviousKeyAccessDenied(t *testing.T) {
user := "user-1"
ctx := context.Background()
reg := prometheus.NewPedanticRegistry()
Expand All @@ -602,12 +602,28 @@ func TestLoader_ShouldUpdateIndexInBackgroundOnPreviousKeyAcessDenied(t *testing
require.NoError(t, services.StopAndAwaitTerminated(ctx, loader))
})

_, _, err := loader.GetIndex(ctx, user)
_, ss, err := loader.GetIndex(ctx, user)
require.True(t, errors.Is(err, bucket.ErrCustomerManagedKeyAccessDenied))
require.Equal(t, Unknown, ss.Status)

// Verify is the index sync status is being returned
ss.Status = CustomerManagedKeyError
ss.NonQueryableReason = CustomerManagedKeyError
WriteSyncStatus(ctx, bkt, user, ss, log.NewNopLogger())

// Check not cached
loader.deleteCachedIndex(user)
_, ss, err = loader.GetIndex(ctx, user)
require.True(t, errors.Is(err, bucket.ErrCustomerManagedKeyAccessDenied))
require.Equal(t, CustomerManagedKeyError, ss.Status)

// Check cached
require.NoError(t, loader.checkCachedIndexes(ctx))

_, ss, err = loader.GetIndex(ctx, user)
require.True(t, errors.Is(err, bucket.ErrCustomerManagedKeyAccessDenied))
require.Equal(t, CustomerManagedKeyError, ss.Status)

loader.bkt = bkt

// Upload the bucket index.
Expand Down