Skip to content

fix: fixes a data race I added changing this to a map #16814

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
Mar 18, 2025
Merged

fix: fixes a data race I added changing this to a map #16814

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions pkg/limits/frontend/ring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,24 @@ func (g *RingStreamUsageGatherer) GetStreamUsage(ctx context.Context, r GetStrea

// TODO(grobinson): Need to rename this to something more accurate.
func (g *RingStreamUsageGatherer) forAllBackends(ctx context.Context, r GetStreamUsageRequest) ([]GetStreamUsageResponse, error) {
replicaSet, err := g.ring.GetAllHealthy(LimitsRead)
rs, err := g.ring.GetAllHealthy(LimitsRead)
if err != nil {
return nil, err
}
return g.forGivenReplicaSet(ctx, replicaSet, r)
return g.forGivenReplicaSet(ctx, rs, r)
}

func (g *RingStreamUsageGatherer) forGivenReplicaSet(ctx context.Context, replicaSet ring.ReplicationSet, r GetStreamUsageRequest) ([]GetStreamUsageResponse, error) {
partitions, err := g.getConsumedPartitions(ctx, replicaSet)
func (g *RingStreamUsageGatherer) forGivenReplicaSet(ctx context.Context, rs ring.ReplicationSet, r GetStreamUsageRequest) ([]GetStreamUsageResponse, error) {
partitions, err := g.getConsumedPartitions(ctx, rs)
if err != nil {
return nil, err
}

errg, ctx := errgroup.WithContext(ctx)
responses := make([]GetStreamUsageResponse, len(replicaSet.Instances))
responses := make([]GetStreamUsageResponse, len(rs.Instances))

// TODO: We shouldn't query all instances since we know which instance holds which stream.
for i, instance := range replicaSet.Instances {
for i, instance := range rs.Instances {
errg.Go(func() error {
client, err := g.pool.GetClientFor(instance.Addr)
if err != nil {
Expand Down Expand Up @@ -93,11 +93,17 @@ func (g *RingStreamUsageGatherer) forGivenReplicaSet(ctx context.Context, replic
return responses, nil
}

func (g *RingStreamUsageGatherer) getConsumedPartitions(ctx context.Context, replicaSet ring.ReplicationSet) (map[string][]int32, error) {
type getAssignedPartitionsResponse struct {
Addr string
Response *logproto.GetAssignedPartitionsResponse
}

func (g *RingStreamUsageGatherer) getConsumedPartitions(ctx context.Context, rs ring.ReplicationSet) (map[string][]int32, error) {
errg, ctx := errgroup.WithContext(ctx)
responses := make(map[string]*logproto.GetAssignedPartitionsResponse)
responses := make([]getAssignedPartitionsResponse, len(rs.Instances))

// Get the partitions assigned to each instance.
for _, instance := range replicaSet.Instances {
for i, instance := range rs.Instances {
errg.Go(func() error {
client, err := g.pool.GetClientFor(instance.Addr)
if err != nil {
Expand All @@ -107,7 +113,9 @@ func (g *RingStreamUsageGatherer) getConsumedPartitions(ctx context.Context, rep
if err != nil {
return err
}
responses[instance.Addr] = resp
// No need for a mutex here as responses is a "Structured variable"
// as described in https://go.dev/ref/spec#Variables.
responses[i] = getAssignedPartitionsResponse{Addr: instance.Addr, Response: resp}
return nil
})
}
Expand All @@ -122,11 +130,11 @@ func (g *RingStreamUsageGatherer) getConsumedPartitions(ctx context.Context, rep
// with the latest timestamp.
highestTimestamp := make(map[int32]int64)
assigned := make(map[int32]string)
for addr, resp := range responses {
for partition, assignedAt := range resp.AssignedPartitions {
for _, resp := range responses {
for partition, assignedAt := range resp.Response.AssignedPartitions {
if t := highestTimestamp[partition]; t < assignedAt {
highestTimestamp[partition] = assignedAt
assigned[partition] = addr
assigned[partition] = resp.Addr
}
}
}
Expand Down