Merge pull request #1310 from ecordell/idlepickerhashring

balancer: rewrite the consistent hashring balancer to avoid recomputations

cmd/spicedb/main.go

@@ -11,7 +11,6 @@ import (
 	_ "google.golang.org/grpc/xds"
 
 	log "github.com/authzed/spicedb/internal/logging"
-	consistentbalancer "github.com/authzed/spicedb/pkg/balancer"
 	"github.com/authzed/spicedb/pkg/cmd"
 	cmdutil "github.com/authzed/spicedb/pkg/cmd/server"
 	"github.com/authzed/spicedb/pkg/cmd/testserver"
@@ -24,7 +23,7 @@ func main() {
 	kuberesolver.RegisterInCluster()
 
 	// Enable consistent hashring gRPC load balancer
-	balancer.Register(consistentbalancer.NewConsistentHashringBuilder(cmdutil.ConsistentHashringPicker))
+	balancer.Register(cmdutil.ConsistentHashringBuilder)
 
 	log.SetGlobalLogger(zerolog.New(os.Stdout))
 

internal/testserver/cluster.go

@@ -59,9 +59,7 @@ var testResolverBuilder = &SafeManualResolverBuilder{}
 
 func init() {
 	// register hashring balancer
-	balancer.Register(hashbalancer.NewConsistentHashringBuilder(
-		hashbalancer.NewConsistentHashringPickerBuilder(xxhash.Sum64, 1500, 1)),
-	)
+	balancer.Register(hashbalancer.NewConsistentHashringBuilder(xxhash.Sum64))
 
 	// Register a manual resolver.Builder  that we can feed addresses for tests
 	// Registration is not thread safe, so we register a single resolver.Builder
@@ -168,7 +166,10 @@ func TestClusterWithDispatchAndCacheConfig(t testing.TB, size uint, ds datastore
 			combineddispatch.UpstreamAddr("test://" + prefix),
 			combineddispatch.PrometheusSubsystem(fmt.Sprintf("%s_%d_client_dispatch", prefix, i)),
 			combineddispatch.GrpcDialOpts(
-				grpc.WithDefaultServiceConfig(hashbalancer.BalancerServiceConfig),
+				grpc.WithDefaultServiceConfig((&hashbalancer.ConsistentHashringBalancerConfig{
+					ReplicationFactor: 1500,
+					Spread:            1,
+				}).MustToServiceConfigJSON()),
 				grpc.WithContextDialer(func(ctx context.Context, s string) (net.Conn, error) {
 					// it's possible grpc tries to dial before we have set the
 					// buffconn dialers, we have to return a "TempError" so that