kvstorage: assert against range desc overlap

Epic: none
Release note: None

pkg/kv/kvserver/kvstorage/init.go

@@ -385,24 +385,32 @@ func LoadAndReconcileReplicas(ctx context.Context, eng storage.Engine) (LoadedRe
 	// the state of the Replica.
 	// INVARIANT: the descriptor for range [a,z) is located at RangeDescriptorKey(a).
 	// This is checked in IterateRangeDescriptorsFromDisk.
-	if err := IterateRangeDescriptorsFromDisk(
-		ctx, eng, func(desc roachpb.RangeDescriptor) error {
-			// INVARIANT: a Replica's RangeDescriptor always contains the local Store,
-			// i.e. a Store is a member of all of its local Replicas.
-			repDesc, found := desc.GetReplicaDescriptor(ident.StoreID)
-			if !found {
-				return errors.AssertionFailedf(
-					"RangeDescriptor does not contain local s%d: %s",
-					ident.StoreID, desc)
-			}
-
-			if err := s.setDesc(desc.RangeID, desc); err != nil {
-				return err
-			}
-			s.setDescReplicaID(desc.RangeID, repDesc.ReplicaID)
-			return nil
-		}); err != nil {
-		return LoadedReplicas{}, err
+	{
+		var lastDesc roachpb.RangeDescriptor
+		if err := IterateRangeDescriptorsFromDisk(
+			ctx, eng, func(desc roachpb.RangeDescriptor) error {
+				if lastDesc.RangeID != 0 && desc.StartKey.Less(lastDesc.EndKey) {
+					return errors.AssertionFailedf("overlapping descriptors %s and %s", lastDesc, desc)
+				}
+				lastDesc = desc
+
+				// INVARIANT: a Replica's RangeDescriptor always contains the local Store,
+				// i.e. a Store is a member of all of its local Replicas.
+				repDesc, found := desc.GetReplicaDescriptor(ident.StoreID)
+				if !found {
+					return errors.AssertionFailedf(
+						"RangeDescriptor does not contain local s%d: %s",
+						ident.StoreID, desc)
+				}
+
+				if err := s.setDesc(desc.RangeID, desc); err != nil {
+					return err
+				}
+				s.setDescReplicaID(desc.RangeID, repDesc.ReplicaID)
+				return nil
+			}); err != nil {
+			return LoadedReplicas{}, err
+		}
 	}
 
 	// INVARIANT: all replicas have a persisted full ReplicaID (i.e. a "ReplicaID from disk").

pkg/kv/kvserver/kvstorage/testdata/assert_overlapping_replica

@@ -10,5 +10,4 @@ r2:{b-d} [(n1,s1):20, next=21, gen=0]
 
 load-and-reconcile
 ----
-r1/10: r1:{a-c} [(n1,s1):10, next=11, gen=0]
-r2/20: r2:{b-d} [(n1,s1):20, next=21, gen=0]
+overlapping descriptors r1:{a-c} [(n1,s1):10, next=11, gen=0] and r2:{b-d} [(n1,s1):20, next=21, gen=0]