Merge pull request #153820 from iskettaneh/backport24.3-153326

release-24.3: allocatorimpl: rm TestAllocatorFullDisks

Author: iskettaneh

pkg/kv/kvserver/allocator/allocatorimpl/allocator_test.go

@@ -8773,160 +8773,6 @@ func (ts *testStore) rebalance(ots *testStore, bytes int64, qps float64, do Disk
 	ots.Capacity.LogicalBytes += bytes
 }
 
-func (ts *testStore) compact() {
-	ts.Capacity.Used = ts.Capacity.LogicalBytes
-	ts.Capacity.Available = ts.Capacity.Capacity - ts.Capacity.Used
-}
-
-func TestAllocatorFullDisks(t *testing.T) {
-	defer leaktest.AfterTest(t)()
-	defer log.Scope(t).Close(t)
-
-	ctx := context.Background()
-	stopper := stop.NewStopper()
-	defer stopper.Stop(ctx)
-
-	st := cluster.MakeTestingClusterSettings()
-	tr := tracing.NewTracer()
-	clock := hlc.NewClockForTesting(nil)
-
-	g := gossip.NewTest(1, stopper, metric.NewRegistry())
-
-	liveness.TimeUntilNodeDead.Override(ctx, &st.SV, liveness.TestTimeUntilNodeDeadOff)
-
-	const generations = 100
-	const nodes = 20
-	const capacity = (1 << 30) + 1
-	const rangeSize = 16 << 20
-
-	mockNodeLiveness := storepool.NewMockNodeLiveness(livenesspb.NodeLivenessStatus_LIVE)
-	sp := storepool.NewStorePool(
-		log.MakeTestingAmbientContext(tr),
-		st,
-		g,
-		clock,
-		func() int {
-			return nodes
-		},
-		mockNodeLiveness.NodeLivenessFunc,
-		false, /* deterministic */
-	)
-	alloc := MakeAllocator(st, false /* deterministic */, func(id roachpb.NodeID) (time.Duration, bool) {
-		return 0, false
-	}, nil)
-
-	var wg sync.WaitGroup
-	g.RegisterCallback(gossip.MakePrefixPattern(gossip.KeyStoreDescPrefix),
-		func(_ string, _ roachpb.Value) { wg.Done() },
-		// Redundant callbacks are required by this test.
-		gossip.Redundant)
-
-	do := makeDiskCapacityOptions(&st.SV)
-
-	// Each range is equally sized (16mb), we want the number of ranges per node,
-	// when their size is added, to be no greater than the full disk rebalance
-	// threshold (0.925%) e.g for below:
-	//   capacity  = 1024mb
-	//   rangeSize = 16mb
-	//   threshold = 0.925
-	//   rangesPerNode =  ⌊1024mb * 0.925 / 16mb⌋ = 59
-	rangesPerNode := int(math.Floor(capacity * do.RebalanceToThreshold / rangeSize))
-	rangesToAdd := rangesPerNode * nodes
-
-	// Initialize testStores.
-	var testStores [nodes]testStore
-	for i := 0; i < len(testStores); i++ {
-		// Don't immediately reclaim disk space from removed ranges. This mimics
-		// range deletions don't immediately reclaim disk space in rocksdb.
-		testStores[i].immediateCompaction = false
-		testStores[i].StoreID = roachpb.StoreID(i)
-		testStores[i].Node = roachpb.NodeDescriptor{NodeID: roachpb.NodeID(i)}
-		testStores[i].Capacity = roachpb.StoreCapacity{Capacity: capacity, Available: capacity}
-	}
-	// Initialize the cluster with a single range.
-	testStores[0].add(rangeSize, 0)
-	rangesAdded := 1
-
-	for i := 0; i < generations; i++ {
-		// First loop through test stores and randomly add data.
-		for j := 0; j < len(testStores); j++ {
-			if mockNodeLiveness.NodeLivenessFunc(roachpb.NodeID(j)) == livenesspb.NodeLivenessStatus_DEAD {
-				continue
-			}
-			ts := &testStores[j]
-			// Add [0,2) ranges to the node, simulating splits and data growth.
-			toAdd := alloc.randGen.Intn(2)
-			for k := 0; k < toAdd; k++ {
-				if rangesAdded < rangesToAdd {
-					ts.add(rangeSize, 0)
-					rangesAdded++
-				}
-			}
-			if ts.Capacity.Available <= 0 {
-				t.Errorf("testStore %d ran out of space during generation %d (rangesAdded=%d/%d): %+v",
-					j, i, rangesAdded, rangesToAdd, ts.Capacity)
-				mockNodeLiveness.SetNodeStatus(roachpb.NodeID(j), livenesspb.NodeLivenessStatus_DEAD)
-			}
-			wg.Add(1)
-			if err := g.AddInfoProto(gossip.MakeStoreDescKey(roachpb.StoreID(j)), &ts.StoreDescriptor, 0); err != nil {
-				t.Fatal(err)
-			}
-		}
-		wg.Wait()
-
-		// Loop through each store a number of times and maybe rebalance.
-		for j := 0; j < 10; j++ {
-			for k := 0; k < len(testStores); k++ {
-				if mockNodeLiveness.NodeLivenessFunc(roachpb.NodeID(k)) == livenesspb.NodeLivenessStatus_DEAD {
-					continue
-				}
-				ts := &testStores[k]
-				// Rebalance until there's no more rebalancing to do.
-				if ts.Capacity.RangeCount > 0 {
-					var rangeUsageInfo allocator.RangeUsageInfo
-					target, _, details, ok := alloc.RebalanceVoter(
-						ctx,
-						sp,
-						emptySpanConfig(),
-						nil,
-						[]roachpb.ReplicaDescriptor{{NodeID: ts.Node.NodeID, StoreID: ts.StoreID}},
-						nil,
-						rangeUsageInfo,
-						storepool.StoreFilterThrottled,
-						alloc.ScorerOptions(ctx),
-					)
-					if ok {
-						if log.V(1) {
-							log.Infof(ctx, "rebalancing to %v; details: %s", target, details)
-						}
-						testStores[k].rebalance(&testStores[int(target.StoreID)], rangeSize, 0 /* qps */, do)
-					}
-				}
-				// Gossip occasionally, as real Stores do when replicas move around.
-				if j%3 == 2 {
-					wg.Add(1)
-					if err := g.AddInfoProto(gossip.MakeStoreDescKey(roachpb.StoreID(j)), &ts.StoreDescriptor, 0); err != nil {
-						t.Fatal(err)
-					}
-				}
-			}
-		}
-
-		// Simulate rocksdb compactions freeing up disk space.
-		for j := 0; j < len(testStores); j++ {
-			if mockNodeLiveness.NodeLivenessFunc(roachpb.NodeID(j)) != livenesspb.NodeLivenessStatus_DEAD {
-				ts := &testStores[j]
-				if ts.Capacity.Available <= 0 {
-					t.Errorf("testStore %d ran out of space during generation %d: %+v", j, i, ts.Capacity)
-					mockNodeLiveness.SetNodeStatus(roachpb.NodeID(j), livenesspb.NodeLivenessStatus_DEAD)
-				} else {
-					ts.compact()
-				}
-			}
-		}
-	}
-}
-
 func Example_rangeCountRebalancing() {
 	testStores := make([]testStore, 20)
 	rebalanceFn := func(ctx context.Context, ts *testStore, testStores []testStore, alloc *Allocator, storePool *storepool.StorePool) {