root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 83 Packages Projects Releases Wiki Activity

Unified Search: Randomise instance selected by distributor (#108619) 

* Randomise instance selected by distributor

* add namespace to distributor logging

---------

Co-authored-by: Will Assis <william@williamassis.com>
This commit is contained in:
Arati R. 2025-07-24 21:38:35 +02:00 committed by GitHub
parent ab92e2cbb6
commit 16aee8047c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/storage/unified/resource/search_server_distributor.go
View File

@ -3,6 +3,7 @@ package resource
import (
"context"
"hash/fnv"
"math/rand"
"time"
"github.com/grafana/dskit/ring"
@ -138,7 +139,9 @@ func (ds *distributorServer) getClientToDistributeRequest(ctx context.Context, n
return ctx, nil, err
}
client, err := ds.clientPool.GetClientForInstance(rs.Instances[0])
// Randomly select an instance for primitive load balancing
inst := rs.Instances[rand.Intn(len(rs.Instances))]
client, err := ds.clientPool.GetClientForInstance(inst)
if err != nil {
return ctx, nil, err
}
@ -148,9 +151,9 @@ func (ds *distributorServer) getClientToDistributeRequest(ctx context.Context, n
md = make(metadata.MD)
}
ds.log.Info("distributing request to ", "methodName", methodName, "instanceId", rs.Instances[0].Id)
ds.log.Info("distributing request to ", "methodName", methodName, "instanceId", inst.Id, "namespace", namespace)
_ = grpc.SetHeader(ctx, metadata.Pairs("proxied-instance-id", rs.Instances[0].Id))
_ = grpc.SetHeader(ctx, metadata.Pairs("proxied-instance-id", inst.Id))
return userutils.InjectOrgID(metadata.NewOutgoingContext(ctx, md), namespace), client.(*RingClient).Client, nil
}