kv: minor cleanup

This commit includes minor cleanups for comments and a small if stmt tweak.

Author: wenyihu6

pkg/kv/kvserver/allocator/mmaprototype/messages.go

@@ -43,11 +43,11 @@ type StoreLeaseholderMsg struct {
 
 // RangeMsg is generated by the leaseholder store (and part of
 // StoreLeaseholderMsg). If there is any change for that range, the full
-// information for that range is provided (and Populated is set to true). This
-// is also the case for a new leaseholder since it does not know whether
-// something has changed since the last leaseholder informed the allocator. A
-// tiny change to the RangeLoad (decided by the caller) will not cause the
-// fields to be populated.
+// information for that range is provided (and MaybeSpanConfIsPopulated is set
+// to true). This is also the case for a new leaseholder since it does not know
+// whether something has changed since the last leaseholder informed the
+// allocator. A tiny change to the RangeLoad (decided by the caller) will not
+// cause the fields to be populated.
 //
 // To ensure that the allocator does not lose synchronization with the current
 // set of replicas, due to spurious changes (we had one undiagnosed example

pkg/kv/kvserver/mma_replica_store.go

@@ -130,10 +130,8 @@ func (mr *mmaReplica) isLeaseholderWithDescAndConfig(
 func constructMMAUpdate(
 	desc *roachpb.RangeDescriptor, raftStatus *raft.Status, leaseholderReplicaStoreID roachpb.StoreID,
 ) []mmaprototype.StoreIDAndReplicaState {
-	if raftStatus == nil {
-		if buildutil.CrdbTestBuild {
-			panic("programming error: raftStatus is nil when constructing range msg")
-		}
+	if raftStatus == nil && buildutil.CrdbTestBuild {
+		panic("programming error: raftStatus is nil when constructing range msg")
 	}
 	// TODO(mma): this is called on every leaseholder replica every minute. We
 	// should pass scratch memory to avoid unnecessary allocation.

pkg/kv/kvserver/replica.go

@@ -1845,6 +1845,9 @@ func (r *Replica) RaftBasicStatus() raft.BasicStatus {
 //
 // NB: This incurs deep copies of Status.Config and Status.Progress.Inflights
 // and is not suitable for use in hot paths. See raftSparseStatusRLocked().
+//
+// TODO(wenyihu6): odd that this is returning a pointer while holding only an
+// RLock.
 func (r *Replica) raftStatusRLocked() *raft.Status {
 	if rg := r.mu.internalRaftGroup; rg != nil {
 		s := rg.Status()

pkg/server/server.go

@@ -904,8 +904,6 @@ func NewServer(cfg Config, stopper *stop.Stopper) (serverctl.ServerStartupInterf
 
 	mmaAllocator := mmaprototype.NewAllocatorState(timeutil.DefaultTimeSource{},
 		rand.New(rand.NewSource(timeutil.Now().UnixNano())))
-	// TODO(mma): Move this into a dedicated integration struct (per node, not
-	// per-store) for mma.Allocator.
 	g.RegisterCallback(
 		gossip.MakePrefixPattern(gossip.KeyStoreDescPrefix),
 		func(_ string, content roachpb.Value, origTimestampNanos int64) {