Skip to content

Commit

Permalink
balancer/leastrequest: Cache atomic load and also add concurrent rpc …
Browse files Browse the repository at this point in the history
…test (#6607)

Co-authored-by: Zach Reyes <[email protected]>
  • Loading branch information
arvindbr8 and zasweq authored Sep 5, 2023
1 parent 5d1c0ae commit 0467e47
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 5 deletions.
55 changes: 55 additions & 0 deletions balancer/leastrequest/balancer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"encoding/json"
"fmt"
"strings"
"sync"
"testing"
"time"

Expand Down Expand Up @@ -455,3 +456,57 @@ func (s) TestLeastRequestPersistsCounts(t *testing.T) {
t.Fatalf("addr count (-got:, +want): %v", diff)
}
}

// TestConcurrentRPCs tests concurrent RPCs on the least request balancer. It
// configures a channel with a least request balancer as the top level balancer,
// and makes 100 RPCs asynchronously. This makes sure no race conditions happen
// in this scenario.
func (s) TestConcurrentRPCs(t *testing.T) {
addresses := setupBackends(t)

mr := manual.NewBuilderWithScheme("lr-e2e")
defer mr.Close()

// Configure least request as top level balancer of channel.
lrscJSON := `
{
"loadBalancingConfig": [
{
"least_request_experimental": {
"choiceCount": 2
}
}
]
}`
sc := internal.ParseServiceConfig.(func(string) *serviceconfig.ParseResult)(lrscJSON)
firstTwoAddresses := []resolver.Address{
{Addr: addresses[0]},
{Addr: addresses[1]},
}
mr.InitialState(resolver.State{
Addresses: firstTwoAddresses,
ServiceConfig: sc,
})

cc, err := grpc.Dial(mr.Scheme()+":///", grpc.WithResolvers(mr), grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
t.Fatalf("grpc.Dial() failed: %v", err)
}
defer cc.Close()
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
defer cancel()
testServiceClient := testgrpc.NewTestServiceClient(cc)

var wg sync.WaitGroup
for i := 0; i < 100; i++ {
wg.Add(1)
go func() {
defer wg.Done()
for j := 0; j < 5; j++ {
testServiceClient.EmptyCall(ctx, &testpb.Empty{})
}
}()
}
wg.Wait()

}
9 changes: 4 additions & 5 deletions balancer/leastrequest/leastrequest.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,14 @@ type picker struct {

func (p *picker) Pick(balancer.PickInfo) (balancer.PickResult, error) {
var pickedSC *scWithRPCCount
var pickedSCNumRPCs int32
for i := 0; i < int(p.choiceCount); i++ {
index := grpcranduint32() % uint32(len(p.subConns))
sc := p.subConns[index]
if pickedSC == nil {
pickedSC = &sc
continue
}
if sc.numRPCs.Load() < pickedSC.numRPCs.Load() {
n := sc.numRPCs.Load()
if pickedSC == nil || n < pickedSCNumRPCs {
pickedSC = &sc
pickedSCNumRPCs = n
}
}
// "The counter for a subchannel should be atomically incremented by one
Expand Down

0 comments on commit 0467e47

Please sign in to comment.