fix: experimental distributor data skew

grafana · Sep 18, 2024 · ca8e7c8 · ca8e7c8
1 parent fcc3dfd
commit ca8e7c8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/...ngester/client/distributor/distributor.go → pkg/experiment/distributor/distributor.go b/...ngester/client/distributor/distributor.go → pkg/experiment/distributor/distributor.go
@@ -12,13 +12,13 @@ import (
 	"github.com/grafana/dskit/ring"
 
 	v1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
-	"github.com/grafana/pyroscope/pkg/experiment/ingester/client/distributor/placement"
+	"github.com/grafana/pyroscope/pkg/experiment/distributor/placement"
 	phlaremodel "github.com/grafana/pyroscope/pkg/model"
 )
 
 const (
 	defaultRingUpdateInterval = 5 * time.Second
-	defaultFallbackLocations  = 5
+	defaultFallbackLocations  = 7
 )
 
 // NewTenantServiceDatasetKey build a distribution key, where
@@ -104,7 +104,7 @@ func (d *Distributor) datasetShards(k placement.Key, ms uint32) ([]shard, uint32
 	if size == 0 {
 		size = s
 	}
-	return d.distribution.selectShards(shards, max(size, ms), k.Dataset), size
+	return selectShards(d.distribution.shards, max(size, ms), k.Dataset), size
 }
 
 // tenantShards returns the list of shards that are available to the tenant.
@@ -114,7 +114,7 @@ func (d *Distributor) tenantShards(k placement.Key, ms uint32) []shard {
 	if size == 0 {
 		return d.distribution.shards
 	}
-	return d.distribution.selectShards(nil, max(size, ms), k.Tenant)
+	return selectShards(d.distribution.shards, max(size, ms), k.Tenant)
 }
 
 // TODO(kolesnikovae):
@@ -227,18 +227,18 @@ func init() {
 	}
 }
 
-func (d *distribution) selectShards(s []shard, n uint32, k uint64) []shard {
+func selectShards(s []shard, n uint32, k uint64) []shard {
 	// m options are available total.
-	m := len(d.shards)
-	// pick n options from m.
+	m := len(s)
+	// Pick n options from m.
 	n = min(uint32(len(steps)), uint32(m), n)
-	s = slices.Grow(s[:0], int(n))
+	x := make([]shard, 0, n)
 	// Note that the choice is deterministic.
 	for i := uint32(0); i < n; i++ {
 		j := jump(k&^steps[i], m)
-		s = append(s, d.shards[j])
+		x = append(x, s[j])
 	}
-	return s
+	return x
 }
 
 // The inputs are a key and the number of buckets.

diff --git a/...er/client/distributor/distributor_test.go → ...xperiment/distributor/distributor_test.go b/...er/client/distributor/distributor_test.go → ...xperiment/distributor/distributor_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
-	"github.com/grafana/pyroscope/pkg/experiment/ingester/client/distributor/placement"
+	"github.com/grafana/pyroscope/pkg/experiment/distributor/placement"
 	"github.com/grafana/pyroscope/pkg/testhelper"
 )
 

diff --git a/...client/distributor/placement/placement.go → ...riment/distributor/placement/placement.go b/...client/distributor/placement/placement.go → ...riment/distributor/placement/placement.go
diff --git a/pkg/experiment/ingester/client/client.go b/pkg/experiment/ingester/client/client.go
@@ -23,9 +23,9 @@ import (
 	"google.golang.org/grpc/status"
 
 	segmentwriterv1 "github.com/grafana/pyroscope/api/gen/proto/go/segmentwriter/v1"
+	"github.com/grafana/pyroscope/pkg/experiment/distributor"
+	"github.com/grafana/pyroscope/pkg/experiment/distributor/placement"
 	"github.com/grafana/pyroscope/pkg/experiment/ingester/client/connpool"
-	"github.com/grafana/pyroscope/pkg/experiment/ingester/client/distributor"
-	"github.com/grafana/pyroscope/pkg/experiment/ingester/client/distributor/placement"
 	"github.com/grafana/pyroscope/pkg/util/circuitbreaker"
 )