@@ -32,7 +32,6 @@ import (
32
32
"github.com/cockroachdb/cockroach/pkg/raft/raftpb"
33
33
"github.com/cockroachdb/cockroach/pkg/raft/tracker"
34
34
"github.com/cockroachdb/cockroach/pkg/roachpb"
35
- "github.com/cockroachdb/cockroach/pkg/settings/cluster"
36
35
"github.com/cockroachdb/cockroach/pkg/spanconfig"
37
36
"github.com/cockroachdb/cockroach/pkg/spanconfig/spanconfigreporter"
38
37
"github.com/cockroachdb/cockroach/pkg/util/hlc"
@@ -576,7 +575,6 @@ func (s *state) AddStore(nodeID NodeID) (Store, bool) {
576
575
storeID : storeID ,
577
576
nodeID : nodeID ,
578
577
desc : roachpb.StoreDescriptor {StoreID : roachpb .StoreID (storeID ), Node : node .Descriptor ()},
579
- settings : s .settings .ST ,
580
578
allocator : allocator ,
581
579
replicas : make (map [RangeID ]ReplicaID ),
582
580
}
@@ -1129,8 +1127,8 @@ func (s *state) Clock() timeutil.TimeSource {
1129
1127
return s .clock
1130
1128
}
1131
1129
1132
- // UpdateStorePool modifies the state of the StorePool for the Store with
1133
- // ID StoreID .
1130
+ // UpdateStorePool modifies the state of the StorePool for the Node with
1131
+ // ID NodeID .
1134
1132
func (s * state ) UpdateStorePool (
1135
1133
nodeID NodeID , storeDescriptors map [roachpb.StoreID ]* storepool.StoreDetailMu ,
1136
1134
) {
@@ -1457,7 +1455,6 @@ type store struct {
1457
1455
nodeID NodeID
1458
1456
desc roachpb.StoreDescriptor
1459
1457
1460
- settings * cluster.Settings
1461
1458
replicas map [RangeID ]ReplicaID
1462
1459
// Old allocator is still used for queues.
1463
1460
allocator allocatorimpl.Allocator
@@ -1552,7 +1549,7 @@ func (r *rng) String() string {
1552
1549
1553
1550
for i , storeID := range storeIDs {
1554
1551
replica := r .replicas [storeID ]
1555
- builder .WriteString (fmt .Sprintf ("s%d:r%d" , storeID , replica .replicaID ))
1552
+ builder .WriteString (fmt .Sprintf ("s%d:r%d(%s) " , storeID , replica .replicaID , replica . desc . Type ))
1556
1553
if r .leaseholder == replica .replicaID {
1557
1554
builder .WriteString ("*" )
1558
1555
}
0 commit comments