diff --git a/pkg/base/config.go b/pkg/base/config.go index d4e3bccef756..0c79f28b028f 100644 --- a/pkg/base/config.go +++ b/pkg/base/config.go @@ -447,6 +447,23 @@ type RaftConfig struct { // begin performing log truncations. RaftLogTruncationThreshold int64 + // RaftProposalQuota controls the maximum aggregate size of Raft commands + // that a leader is allowed to propose concurrently. + // + // By default, the quota is set to a fraction of the Raft log truncation + // threshold. In doing so, we ensure all replicas have sufficiently up to + // date logs so that when the log gets truncated, the followers do not need + // non-preemptive snapshots. Changing this deserves care. Too low and + // everything comes to a grinding halt, too high and we're not really + // throttling anything (we'll still generate snapshots). + RaftProposalQuota int64 + + // RaftMaxUncommittedEntriesSize controls how large the uncommitted tail of + // the Raft log can grow. The limit is meant to provide protection against + // unbounded Raft log growth when quorum is lost and entries stop being + // committed but continue to be proposed. + RaftMaxUncommittedEntriesSize uint64 + // RaftMaxSizePerMsg controls how many Raft log entries the leader will send to // followers in a single MsgApp. RaftMaxSizePerMsg uint64 @@ -475,6 +492,18 @@ func (cfg *RaftConfig) SetDefaults() { if cfg.RaftLogTruncationThreshold == 0 { cfg.RaftLogTruncationThreshold = defaultRaftLogTruncationThreshold } + if cfg.RaftProposalQuota == 0 { + // By default, set this to a fraction of RaftLogMaxSize. See the comment + // on the field for the tradeoffs of setting this higher or lower. + cfg.RaftProposalQuota = cfg.RaftLogTruncationThreshold / 4 + } + if cfg.RaftMaxUncommittedEntriesSize == 0 { + // By default, set this to twice the RaftProposalQuota. The logic here + // is that the quotaPool should be responsible for throttling proposals + // in all cases except for unbounded Raft re-proposals because it queues + // efficiently instead of dropping proposals on the floor indiscriminately. + cfg.RaftMaxUncommittedEntriesSize = uint64(2 * cfg.RaftProposalQuota) + } if cfg.RaftMaxSizePerMsg == 0 { cfg.RaftMaxSizePerMsg = uint64(defaultRaftMaxSizePerMsg) } diff --git a/pkg/storage/client_raft_test.go b/pkg/storage/client_raft_test.go index 500146faba9d..ca186c8f9710 100644 --- a/pkg/storage/client_raft_test.go +++ b/pkg/storage/client_raft_test.go @@ -1154,6 +1154,8 @@ func TestLogGrowthWhenRefreshingPendingCommands(t *testing.T) { sc.RaftTickInterval = 10 * time.Millisecond // Don't timeout raft leader. We don't want leadership moving. sc.RaftElectionTimeoutTicks = 1000000 + // Reduce the max uncommitted entry size. + sc.RaftMaxUncommittedEntriesSize = 64 << 10 // 64 KB // Disable leader transfers during leaseholder changes so that we // can easily create leader-not-leaseholder scenarios. sc.TestingKnobs.DisableLeaderFollowsLeaseholder = true @@ -1232,7 +1234,7 @@ func TestLogGrowthWhenRefreshingPendingCommands(t *testing.T) { // While a majority nodes are down, write some data. putRes := make(chan *roachpb.Error) go func() { - putArgs := putArgs([]byte("b"), make([]byte, 8<<10 /* 8 KB */)) + putArgs := putArgs([]byte("b"), make([]byte, sc.RaftMaxUncommittedEntriesSize/8)) _, err := client.SendWrapped(context.Background(), propNode, putArgs) putRes <- err }() @@ -1253,11 +1255,10 @@ func TestLogGrowthWhenRefreshingPendingCommands(t *testing.T) { } // Check raft log size. - const logSizeLimit = 64 << 10 // 64 KB curlogSize := leaderRepl.GetRaftLogSize() logSize := curlogSize - initLogSize logSizeStr := humanizeutil.IBytes(logSize) - if logSize > logSizeLimit { + if uint64(logSize) > sc.RaftMaxUncommittedEntriesSize { t.Fatalf("raft log size grew to %s", logSizeStr) } t.Logf("raft log size grew to %s", logSizeStr) diff --git a/pkg/storage/replica.go b/pkg/storage/replica.go index ec28ea3da1fd..7fe65c7ee1b1 100644 --- a/pkg/storage/replica.go +++ b/pkg/storage/replica.go @@ -384,12 +384,7 @@ type Replica struct { // map must only be referenced while Replica.mu is held, except if the // element is removed from the map first. The notable exception is the // contained RaftCommand, which we treat as immutable. - localProposals map[storagebase.CmdIDKey]*ProposalData - // remoteProposals is maintained by Raft leaders and stores in-flight - // commands that were forwarded to the leader during its current term. - // The set allows leaders to detect duplicate forwarded commands and - // avoid re-proposing the same forwarded command multiple times. - remoteProposals map[storagebase.CmdIDKey]struct{} + localProposals map[storagebase.CmdIDKey]*ProposalData internalRaftGroup *raft.RawNode // The ID of the replica within the Raft group. May be 0 if the replica has // been created from a preemptive snapshot (i.e. before being added to the @@ -879,7 +874,6 @@ func (r *Replica) cancelPendingCommandsLocked() { ProposalRetry: proposalRangeNoLongerExists, }) } - r.mu.remoteProposals = nil } // cleanupFailedProposalLocked cleans up after a proposal that has failed. It @@ -1114,23 +1108,12 @@ func (r *Replica) updateProposalQuotaRaftMuLocked( log.Fatalf(ctx, "len(r.mu.commandSizes) = %d, expected 0", commandSizesLen) } - // We set the defaultProposalQuota to be less than the Raft log - // truncation threshold, in doing so we ensure all replicas have - // sufficiently up to date logs so that when the log gets truncated, - // the followers do not need non-preemptive snapshots. Changing this - // deserves care. Too low and everything comes to a grinding halt, - // too high and we're not really throttling anything (we'll still - // generate snapshots). - // - // TODO(nvanbenschoten): clean this up in later commits. - proposalQuota := r.store.cfg.RaftLogTruncationThreshold / 4 - // Raft may propose commands itself (specifically the empty // commands when leadership changes), and these commands don't go // through the code paths where we acquire quota from the pool. To // offset this we reset the quota pool whenever leadership changes // hands. - r.mu.proposalQuota = newQuotaPool(proposalQuota) + r.mu.proposalQuota = newQuotaPool(r.store.cfg.RaftProposalQuota) r.mu.lastUpdateTimes = make(map[roachpb.ReplicaID]time.Time) r.mu.commandSizes = make(map[storagebase.CmdIDKey]int) } else if r.mu.proposalQuota != nil { @@ -1901,7 +1884,6 @@ func (r *Replica) State() storagebase.RangeInfo { ri.ReplicaState = *(protoutil.Clone(&r.mu.state)).(*storagebase.ReplicaState) ri.LastIndex = r.mu.lastIndex ri.NumPending = uint64(len(r.mu.localProposals)) - ri.NumRemotePending = uint64(len(r.mu.remoteProposals)) ri.RaftLogSize = r.mu.raftLogSize ri.NumDropped = uint64(r.mu.droppedMessages) if r.mu.proposalQuota != nil { @@ -3981,20 +3963,7 @@ func (r *Replica) stepRaftGroup(req *RaftMessageRequest) error { // we expect the originator to campaign instead. r.unquiesceWithOptionsLocked(false /* campaignOnWake */) r.refreshLastUpdateTimeForReplicaLocked(req.FromReplica.ReplicaID) - - // Check if the message is a proposal that should be dropped. - if r.shouldDropForwardedProposalLocked(req) { - // If we could signal to the sender that its proposal was accepted - // or dropped then we wouldn't need to track anything. - return false /* unquiesceAndWakeLeader */, nil - } - err := raftGroup.Step(req.Message) - if err == nil { - // If we stepped successfully and the request is a proposal, consider - // tracking it so that we can ignore identical proposals in the future. - r.maybeTrackForwardedProposalLocked(raftGroup, req) - } if err == raft.ErrProposalDropped { // A proposal was forwarded to this replica but we couldn't propose it. // Swallow the error since we don't have an effective way of signaling @@ -4007,80 +3976,6 @@ func (r *Replica) stepRaftGroup(req *RaftMessageRequest) error { }) } -func (r *Replica) shouldDropForwardedProposalLocked(req *RaftMessageRequest) bool { - if req.Message.Type != raftpb.MsgProp { - // Not a proposal. - return false - } - - for _, e := range req.Message.Entries { - switch e.Type { - case raftpb.EntryNormal: - if len(e.Data) == 0 { - // Don't drop empty proposals. We don't really expect those to come in from - // remote nodes (as they're proposed by new leaders), but it does happen. - // Whether these are dropped or not should not matter. We opt to not drop - // them. - return false - } - cmdID, _ := DecodeRaftCommand(e.Data) - if _, ok := r.mu.remoteProposals[cmdID]; !ok { - // Untracked remote proposal. Don't drop. - return false - } - case raftpb.EntryConfChange: - // Never drop EntryConfChange proposals. - return false - default: - log.Fatalf(context.TODO(), "unexpected Raft entry: %v", e) - } - } - // All entries tracked. - return true -} - -func (r *Replica) maybeTrackForwardedProposalLocked(rg *raft.RawNode, req *RaftMessageRequest) { - if req.Message.Type != raftpb.MsgProp { - // Not a proposal. - return - } - - if rg.Status().RaftState != raft.StateLeader { - // We're not the leader. We can't be sure that the proposal made it into - // the Raft log, so don't track it. - return - } - - // Record that each of the proposal's entries was seen and appended. This - // allows us to catch duplicate forwarded proposals in the future and - // prevent them from being repeatedly appended to a leader's raft log. - for _, e := range req.Message.Entries { - switch e.Type { - case raftpb.EntryNormal: - if len(e.Data) == 0 { - // Ignore empty proposals, which are different than proposals - // with no data. These are sent on leadership changes. - continue - } - cmdID, data := DecodeRaftCommand(e.Data) - if len(data) == 0 { - // An empty command is proposed to unquiesce a range and - // wake the leader. Don't keep track of these forwarded - // proposals because they will never be cleaned up. - } else { - if r.mu.remoteProposals == nil { - r.mu.remoteProposals = map[storagebase.CmdIDKey]struct{}{} - } - r.mu.remoteProposals[cmdID] = struct{}{} - } - case raftpb.EntryConfChange: - // Don't track EntryConfChanges. - default: - log.Fatalf(context.TODO(), "unexpected Raft entry: %v", e) - } - } -} - type handleRaftReadyStats struct { processed int } @@ -4344,12 +4239,7 @@ func (r *Replica) handleRaftReadyRaftMuLocked( r.mu.lastIndex = lastIndex r.mu.lastTerm = lastTerm r.mu.raftLogSize = raftLogSize - if r.mu.leaderID != leaderID { - r.mu.leaderID = leaderID - // Clear the remote proposal set. Would have been nil already if not - // previously the leader. - r.mu.remoteProposals = nil - } + r.mu.leaderID = leaderID r.mu.Unlock() // Update raft log entry cache. We clear any older, uncommitted log entries @@ -4553,22 +4443,13 @@ func (r *Replica) tick(livenessMap map[roachpb.NodeID]bool) (bool, error) { if knob := r.store.TestingKnobs().RefreshReasonTicksPeriod; knob > 0 { refreshAtDelta = knob } - if !r.store.TestingKnobs().DisableRefreshReasonTicks && - r.mu.replicaID != r.mu.leaderID && - r.mu.ticks%refreshAtDelta == 0 { + if !r.store.TestingKnobs().DisableRefreshReasonTicks && r.mu.ticks%refreshAtDelta == 0 { // RaftElectionTimeoutTicks is a reasonable approximation of how long we // should wait before deciding that our previous proposal didn't go // through. Note that the combination of the above condition and passing // RaftElectionTimeoutTicks to refreshProposalsLocked means that commands // will be refreshed when they have been pending for 1 to 2 election // cycles. - // - // However, we don't refresh proposals if we are the leader because - // doing so would be useless. The commands tracked by a leader replica - // were either all proposed when the replica was a leader or were - // re-proposed when the replica became a leader. Either way, they are - // guaranteed to be in the leader's Raft log so re-proposing won't do - // anything. r.refreshProposalsLocked(refreshAtDelta, reasonTicks) } return true, nil @@ -5362,9 +5243,6 @@ func (r *Replica) processRaftCommand( delete(r.mu.localProposals, idKey) } - // Delete the entry for a forwarded proposal set. - delete(r.mu.remoteProposals, idKey) - leaseIndex, proposalRetry, forcedErr := r.checkForcedErrLocked(ctx, idKey, raftCmd, proposal, proposedLocally) r.mu.Unlock() diff --git a/pkg/storage/replica_test.go b/pkg/storage/replica_test.go index bb013c257b8d..20f18b066779 100644 --- a/pkg/storage/replica_test.go +++ b/pkg/storage/replica_test.go @@ -8392,175 +8392,6 @@ func TestReplicaRefreshPendingCommandsTicks(t *testing.T) { } } -func TestReplicaShouldDropForwardedProposal(t *testing.T) { - defer leaktest.AfterTest(t)() - - cmdSeen, cmdNotSeen := makeIDKey(), makeIDKey() - data := []byte("data") - - testCases := []struct { - name string - leader bool - msg raftpb.Message - expDrop bool - expRemotePropsAfter int - }{ - { - name: "empty proposal (nil):", - leader: true, - msg: raftpb.Message{ - Type: raftpb.MsgProp, - Entries: []raftpb.Entry{ - {Type: raftpb.EntryNormal, Data: nil}, - }, - }, - expDrop: false, - expRemotePropsAfter: 1, - }, - { - name: "empty proposal (zero)", - leader: true, - msg: raftpb.Message{ - Type: raftpb.MsgProp, - Entries: []raftpb.Entry{ - {Type: raftpb.EntryNormal, Data: []byte{}}, - }, - }, - expDrop: false, - expRemotePropsAfter: 1, - }, - { - name: "new proposal", - leader: true, - msg: raftpb.Message{ - Type: raftpb.MsgProp, - Entries: []raftpb.Entry{ - {Type: raftpb.EntryNormal, Data: encodeRaftCommandV1(cmdNotSeen, data)}, - }, - }, - expDrop: false, - expRemotePropsAfter: 2, - }, - { - name: "duplicate proposal", - leader: true, - msg: raftpb.Message{ - Type: raftpb.MsgProp, - Entries: []raftpb.Entry{ - {Type: raftpb.EntryNormal, Data: encodeRaftCommandV1(cmdSeen, data)}, - }, - }, - expDrop: true, - expRemotePropsAfter: 1, - }, - { - name: "partially new proposal", - leader: true, - msg: raftpb.Message{ - Type: raftpb.MsgProp, - Entries: []raftpb.Entry{ - {Type: raftpb.EntryNormal, Data: encodeRaftCommandV1(cmdNotSeen, data)}, - {Type: raftpb.EntryNormal, Data: encodeRaftCommandV1(cmdSeen, data)}, - }, - }, - expDrop: false, - expRemotePropsAfter: 2, - }, - { - name: "proposal with no data (not an empty proposal)", - leader: true, - msg: raftpb.Message{ - Type: raftpb.MsgProp, - Entries: []raftpb.Entry{ - {Type: raftpb.EntryNormal, Data: encodeRaftCommandV1(cmdNotSeen, nil)}, - }, - }, - expDrop: false, - expRemotePropsAfter: 1, - }, - { - name: "conf change", - leader: true, - msg: raftpb.Message{ - Type: raftpb.MsgProp, - Entries: []raftpb.Entry{ - {Type: raftpb.EntryConfChange, Data: encodeRaftCommandV1(cmdNotSeen, data)}, - }, - }, - expDrop: false, - expRemotePropsAfter: 1, - }, - { - name: "non proposal", - leader: true, - msg: raftpb.Message{ - Type: raftpb.MsgApp, - }, - expDrop: false, - expRemotePropsAfter: 1, - }, - { - name: "not leader", - leader: false, - msg: raftpb.Message{ - Type: raftpb.MsgProp, - Entries: []raftpb.Entry{ - {Type: raftpb.EntryNormal, Data: encodeRaftCommandV1(cmdNotSeen, data)}, - }, - }, - expDrop: false, - expRemotePropsAfter: 0, - }, - } - for _, c := range testCases { - t.Run(c.name, func(t *testing.T) { - var tc testContext - stopper := stop.NewStopper() - defer stopper.Stop(context.TODO()) - tc.Start(t, stopper) - tc.repl.mu.Lock() - defer tc.repl.mu.Unlock() - - rg := tc.repl.mu.internalRaftGroup - if c.leader { - // Set the remoteProposals map to only contain cmdSeen. - tc.repl.mu.remoteProposals = map[storagebase.CmdIDKey]struct{}{ - cmdSeen: {}, - } - // Make sure the replica is the leader. - if s := rg.Status(); s.RaftState != raft.StateLeader { - t.Errorf("Replica not leader: %v", s) - } - } else { - // Clear the remoteProposals map. - tc.repl.mu.remoteProposals = nil - // Force the replica to step down as the leader by sending it a - // heartbeat at a high term. - if err := rg.Step(raftpb.Message{ - Type: raftpb.MsgHeartbeat, - Term: 999, - }); err != nil { - t.Error(err) - } - if s := rg.Status(); s.RaftState != raft.StateFollower { - t.Errorf("Replica not follower: %v", s) - } - } - - req := &RaftMessageRequest{Message: c.msg} - drop := tc.repl.shouldDropForwardedProposalLocked(req) - if c.expDrop != drop { - t.Errorf("expected drop=%t, found %t", c.expDrop, drop) - } - - tc.repl.maybeTrackForwardedProposalLocked(rg, req) - if l := len(tc.repl.mu.remoteProposals); c.expRemotePropsAfter != l { - t.Errorf("expected %d tracked remote proposals, found %d", c.expRemotePropsAfter, l) - } - }) - } -} - // checkValue asserts that the value for a key is the expected one. // The function will attempt to resolve the intent present on the key, if any. func checkValue(ctx context.Context, tc *testContext, key []byte, expectedVal []byte) error { diff --git a/pkg/storage/storagebase/state.pb.go b/pkg/storage/storagebase/state.pb.go index 016d31071761..9f8d1d601558 100644 --- a/pkg/storage/storagebase/state.pb.go +++ b/pkg/storage/storagebase/state.pb.go @@ -84,10 +84,9 @@ func (*ReplicaState) Descriptor() ([]byte, []int) { return fileDescriptorState, type RangeInfo struct { ReplicaState `protobuf:"bytes,1,opt,name=state,embedded=state" json:"state"` // The highest (and last) index in the Raft log. - LastIndex uint64 `protobuf:"varint,2,opt,name=last_index,json=lastIndex,proto3" json:"last_index,omitempty"` - NumPending uint64 `protobuf:"varint,3,opt,name=num_pending,json=numPending,proto3" json:"num_pending,omitempty"` - NumRemotePending uint64 `protobuf:"varint,9,opt,name=num_remote_pending,json=numRemotePending,proto3" json:"num_remote_pending,omitempty"` - NumDropped uint64 `protobuf:"varint,5,opt,name=num_dropped,json=numDropped,proto3" json:"num_dropped,omitempty"` + LastIndex uint64 `protobuf:"varint,2,opt,name=last_index,json=lastIndex,proto3" json:"last_index,omitempty"` + NumPending uint64 `protobuf:"varint,3,opt,name=num_pending,json=numPending,proto3" json:"num_pending,omitempty"` + NumDropped uint64 `protobuf:"varint,5,opt,name=num_dropped,json=numDropped,proto3" json:"num_dropped,omitempty"` // raft_log_size may be initially inaccurate after a server restart. // See storage.Replica.mu.raftLogSize. RaftLogSize int64 `protobuf:"varint,6,opt,name=raft_log_size,json=raftLogSize,proto3" json:"raft_log_size,omitempty"` @@ -216,9 +215,6 @@ func (this *RangeInfo) Equal(that interface{}) bool { if this.NumPending != that1.NumPending { return false } - if this.NumRemotePending != that1.NumRemotePending { - return false - } if this.NumDropped != that1.NumDropped { return false } @@ -384,11 +380,6 @@ func (m *RangeInfo) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintState(dAtA, i, uint64(m.RangeMaxBytes)) } - if m.NumRemotePending != 0 { - dAtA[i] = 0x48 - i++ - i = encodeVarintState(dAtA, i, uint64(m.NumRemotePending)) - } return i, nil } @@ -620,9 +611,6 @@ func (m *RangeInfo) Size() (n int) { if m.RangeMaxBytes != 0 { n += 1 + sovState(uint64(m.RangeMaxBytes)) } - if m.NumRemotePending != 0 { - n += 1 + sovState(uint64(m.NumRemotePending)) - } return n } @@ -1173,25 +1161,6 @@ func (m *RangeInfo) Unmarshal(dAtA []byte) error { break } } - case 9: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NumRemotePending", wireType) - } - m.NumRemotePending = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowState - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.NumRemotePending |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipState(dAtA[iNdEx:]) @@ -1864,65 +1833,64 @@ var ( func init() { proto.RegisterFile("storage/storagebase/state.proto", fileDescriptorState) } var fileDescriptorState = []byte{ - // 947 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcf, 0x6f, 0xdb, 0x36, - 0x14, 0x8e, 0x2c, 0x3b, 0xb1, 0xa9, 0xb6, 0xf1, 0xb8, 0x76, 0x15, 0x3c, 0xc4, 0x0e, 0x0c, 0x74, - 0x30, 0xb0, 0x4e, 0x06, 0xb2, 0x1f, 0x18, 0x82, 0x5e, 0xea, 0xa4, 0x28, 0xda, 0xa4, 0x43, 0x4b, - 0x07, 0x3b, 0xec, 0x22, 0xd0, 0x12, 0x23, 0x6b, 0xa5, 0x48, 0x96, 0xa2, 0x0a, 0xbb, 0xdb, 0x79, - 0xe7, 0xfd, 0x09, 0xbb, 0xef, 0x6f, 0xd8, 0x3d, 0xc7, 0x1e, 0x77, 0x32, 0x36, 0xef, 0xb2, 0xe3, - 0xb0, 0xfb, 0x80, 0x81, 0x94, 0xe4, 0xc8, 0x59, 0xb0, 0x16, 0x39, 0xf4, 0x64, 0xf2, 0xbd, 0xef, - 0xfd, 0xfa, 0xde, 0x47, 0x19, 0xf4, 0x52, 0xc5, 0x25, 0x8e, 0xc8, 0xb0, 0xf8, 0x9d, 0xe0, 0x54, - 0x9f, 0xb1, 0x22, 0x9e, 0x90, 0x5c, 0x71, 0xb8, 0x13, 0xf0, 0xe0, 0xb9, 0xe4, 0x38, 0x98, 0x7a, - 0x05, 0xc4, 0xab, 0x40, 0x3b, 0xfd, 0x32, 0x9e, 0xb0, 0x28, 0x66, 0xe5, 0x8f, 0x98, 0x0c, 0x93, - 0x97, 0x41, 0x90, 0xa7, 0xe8, 0x7c, 0x68, 0xc2, 0xc5, 0x64, 0x18, 0x33, 0x45, 0x24, 0xc3, 0xd4, - 0x97, 0xf8, 0x54, 0x15, 0xce, 0x0f, 0x4a, 0x67, 0x42, 0x14, 0x0e, 0xb1, 0xc2, 0x85, 0x1d, 0x96, - 0xf6, 0x8a, 0xcd, 0xcd, 0x54, 0x4c, 0x87, 0x53, 0x1a, 0x0c, 0x55, 0x9c, 0x90, 0x54, 0xe1, 0x44, - 0x14, 0x9e, 0x9b, 0x11, 0x8f, 0xb8, 0x39, 0x0e, 0xf5, 0x29, 0xb7, 0xf6, 0x7f, 0x6e, 0x80, 0x6b, - 0x88, 0x08, 0x1a, 0x07, 0x78, 0xac, 0x47, 0x82, 0x77, 0x01, 0xd4, 0xa5, 0x7d, 0x2c, 0x04, 0x8d, - 0x49, 0xe8, 0xc7, 0x2c, 0x24, 0x33, 0xd7, 0xda, 0xb5, 0x06, 0x75, 0xd4, 0xd6, 0x9e, 0xfb, 0xb9, - 0xe3, 0x91, 0xb6, 0x43, 0x0f, 0xbc, 0x4f, 0x09, 0x4e, 0xc9, 0x05, 0x78, 0xcd, 0xc0, 0xdf, 0x33, - 0xae, 0x35, 0xfc, 0x17, 0xa0, 0x1e, 0x92, 0x34, 0x70, 0xed, 0x5d, 0x6b, 0xe0, 0xec, 0xf5, 0xbd, - 0x73, 0xe6, 0x8a, 0x59, 0x3c, 0x84, 0x59, 0x44, 0x0e, 0x49, 0x1a, 0xc8, 0x58, 0x28, 0x2e, 0x91, - 0xc1, 0x43, 0x0f, 0x34, 0x4c, 0x32, 0xb7, 0x6e, 0x02, 0xdd, 0x4b, 0x02, 0x8f, 0xb5, 0x1f, 0xe5, - 0x30, 0xf8, 0x15, 0xd8, 0x56, 0x32, 0x63, 0x01, 0x56, 0x24, 0xf4, 0xcd, 0xae, 0xdc, 0x86, 0x89, - 0xbc, 0x73, 0x69, 0xc9, 0x53, 0x75, 0x52, 0xa2, 0x0d, 0x0b, 0xe8, 0x86, 0x5a, 0xbb, 0x43, 0x0e, - 0xae, 0x45, 0x81, 0xaf, 0xa6, 0x92, 0xa4, 0x53, 0x4e, 0x43, 0x77, 0xd3, 0x24, 0xdb, 0xa9, 0x24, - 0xd3, 0xbc, 0x7b, 0x53, 0x1a, 0x78, 0x27, 0x25, 0xef, 0xa3, 0x4f, 0x96, 0x8b, 0x9e, 0xf3, 0xf0, - 0xe0, 0xa4, 0x8c, 0xfa, 0x7b, 0xd1, 0xeb, 0xac, 0x02, 0xc2, 0xc9, 0x7e, 0x5f, 0x62, 0x16, 0xb2, - 0x8c, 0x52, 0x3c, 0xa1, 0xa4, 0x8f, 0x9c, 0x28, 0x58, 0x41, 0xe1, 0x08, 0x34, 0x74, 0xdb, 0xa9, - 0xbb, 0x65, 0x2a, 0xdd, 0xf5, 0xfe, 0xab, 0xb1, 0x5c, 0x47, 0x5e, 0x29, 0x27, 0xef, 0xc9, 0xd7, - 0x07, 0x07, 0xba, 0xdb, 0x14, 0xe5, 0xa1, 0xf0, 0x07, 0x0b, 0xdc, 0x52, 0x33, 0xe6, 0xa7, 0x02, - 0x33, 0x7f, 0xad, 0xfd, 0xd6, 0xdb, 0xb4, 0xff, 0xd9, 0x72, 0xd1, 0x83, 0x27, 0x33, 0x36, 0x16, - 0x98, 0xbd, 0xfd, 0x14, 0x50, 0x15, 0x11, 0x95, 0x61, 0x3e, 0x07, 0xb7, 0xb3, 0x34, 0x66, 0xd1, - 0x4a, 0x25, 0x66, 0x23, 0xfe, 0x73, 0x32, 0x77, 0x9d, 0x5d, 0x6b, 0xd0, 0x44, 0x37, 0x8d, 0xbb, - 0x50, 0x8a, 0x61, 0xfc, 0x88, 0xcc, 0xf7, 0xeb, 0x7f, 0xfe, 0xd4, 0xb3, 0x1e, 0xd7, 0x9b, 0xcd, - 0x76, 0xeb, 0x71, 0xbd, 0x09, 0xda, 0x4e, 0xff, 0x9f, 0x1a, 0x68, 0x19, 0x81, 0x3c, 0x62, 0xa7, - 0x1c, 0x1e, 0xe5, 0x1c, 0x11, 0xa3, 0x4e, 0x67, 0xef, 0x63, 0xef, 0x7f, 0xdf, 0xa1, 0x57, 0x95, - 0xf9, 0xa8, 0x79, 0xb6, 0xe8, 0x6d, 0xbc, 0x5e, 0xf4, 0xac, 0x9c, 0x2c, 0x02, 0x77, 0x00, 0xa0, - 0x38, 0x55, 0x6b, 0x02, 0x6e, 0x69, 0x4b, 0x2e, 0xdc, 0x1e, 0x70, 0x58, 0x96, 0xf8, 0x82, 0xb0, - 0x30, 0x66, 0x91, 0xd1, 0x6f, 0x1d, 0x01, 0x96, 0x25, 0x4f, 0x73, 0x4b, 0x09, 0x08, 0x25, 0x17, - 0x82, 0x84, 0x46, 0x6d, 0x39, 0xe0, 0x30, 0xb7, 0xc0, 0x3e, 0xb8, 0x6e, 0x1e, 0x16, 0xe5, 0x91, - 0x9f, 0xc6, 0xaf, 0x88, 0xd1, 0x90, 0x8d, 0x1c, 0x6d, 0x3c, 0xe6, 0xd1, 0x38, 0x7e, 0x45, 0xe0, - 0x3d, 0xd0, 0xc1, 0x42, 0x48, 0x3e, 0x8b, 0x13, 0x4d, 0x90, 0x90, 0x5c, 0xf0, 0x14, 0x53, 0xff, - 0x45, 0xc6, 0x15, 0x36, 0x52, 0xb0, 0x91, 0x5b, 0x41, 0x3c, 0x2d, 0x00, 0xcf, 0xb4, 0x1f, 0x7e, - 0x04, 0xb6, 0xa5, 0x26, 0xc7, 0x4f, 0xf0, 0xcc, 0x9f, 0xcc, 0x15, 0x49, 0xdd, 0xa6, 0x09, 0xb9, - 0x6e, 0xcc, 0x4f, 0xf0, 0x6c, 0xa4, 0x8d, 0xfa, 0x89, 0xeb, 0x56, 0x25, 0x49, 0xb8, 0x2e, 0x52, - 0x8c, 0xd4, 0xca, 0x9f, 0x38, 0xcb, 0x12, 0x64, 0x1c, 0xc5, 0x60, 0xab, 0x2d, 0xd4, 0xdb, 0x8d, - 0xfe, 0x5f, 0x0d, 0x70, 0xeb, 0x80, 0x27, 0x09, 0x66, 0xe1, 0xb3, 0x8c, 0x64, 0x24, 0x1d, 0x33, - 0x2c, 0xd2, 0x29, 0x57, 0xf0, 0x3e, 0x68, 0xad, 0x3e, 0x38, 0xc5, 0x3e, 0xde, 0x20, 0xaf, 0xba, - 0xde, 0x00, 0x3a, 0x8f, 0x82, 0xdf, 0x02, 0x40, 0x79, 0x80, 0xe9, 0x38, 0xe0, 0x82, 0xb8, 0xb5, - 0x5d, 0x7b, 0xe0, 0xec, 0x1d, 0xbe, 0x61, 0xa7, 0x97, 0x36, 0xe3, 0x1d, 0xaf, 0xd2, 0x3c, 0x60, - 0x4a, 0xce, 0x8b, 0x52, 0x95, 0xec, 0x30, 0x01, 0x4e, 0x44, 0xf9, 0xa4, 0x2c, 0x66, 0x9b, 0x62, - 0x0f, 0xae, 0x54, 0xec, 0xe1, 0x79, 0x9e, 0x6a, 0xb5, 0x6a, 0xfe, 0xce, 0x2f, 0x16, 0xd8, 0x2a, - 0xa2, 0xe1, 0x0d, 0x50, 0x8b, 0x43, 0x43, 0x91, 0x8d, 0x6a, 0x71, 0x08, 0xdb, 0xc0, 0xd6, 0x0f, - 0x41, 0x2b, 0xae, 0x85, 0xf4, 0x11, 0xde, 0x06, 0x5b, 0x84, 0x85, 0xe6, 0x79, 0xd8, 0xc6, 0xba, - 0x49, 0x58, 0x78, 0x44, 0xe6, 0xb0, 0x03, 0x9a, 0x92, 0xe0, 0x90, 0x33, 0x3a, 0x37, 0x1f, 0xc2, - 0x26, 0x5a, 0xdd, 0xd7, 0x17, 0xd0, 0xb8, 0xd2, 0x02, 0x5c, 0xb0, 0x25, 0x24, 0x91, 0xe4, 0x45, - 0xea, 0x6e, 0xee, 0xda, 0x03, 0x1b, 0x95, 0xd7, 0xce, 0x77, 0x60, 0xfb, 0x02, 0xa7, 0x65, 0xdb, - 0xf9, 0x1c, 0xa6, 0x6d, 0x04, 0x1a, 0x2f, 0x31, 0xcd, 0x88, 0x19, 0xc5, 0xd9, 0xbb, 0x77, 0x25, - 0x36, 0x0b, 0x2b, 0xca, 0x53, 0xed, 0xd7, 0xbe, 0xb4, 0x3a, 0xdf, 0x83, 0xf6, 0x45, 0x8e, 0xdf, - 0x5d, 0xf5, 0xd1, 0x9d, 0xb3, 0xdf, 0xbb, 0x1b, 0x67, 0xcb, 0xae, 0xf5, 0x7a, 0xd9, 0xb5, 0x7e, - 0x5d, 0x76, 0xad, 0xdf, 0x96, 0x5d, 0xeb, 0xc7, 0x3f, 0xba, 0x1b, 0xdf, 0x38, 0x95, 0x7c, 0x93, - 0x4d, 0xf3, 0x77, 0xfa, 0xe9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xa3, 0x52, 0xd2, 0x2d, + // 931 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x3f, 0x6f, 0xdb, 0x46, + 0x1c, 0x35, 0x45, 0xca, 0x96, 0x8e, 0x49, 0xac, 0x5e, 0x93, 0x86, 0x50, 0x61, 0x49, 0x10, 0x90, + 0x42, 0x40, 0x53, 0x0a, 0x70, 0xff, 0xa0, 0x30, 0xb2, 0x44, 0x76, 0x10, 0xc4, 0x76, 0x8a, 0xe4, + 0x64, 0x74, 0xe8, 0x42, 0x9c, 0xc8, 0x33, 0xc5, 0xe6, 0x78, 0x77, 0x21, 0x8f, 0x81, 0x94, 0x76, + 0xee, 0xdc, 0x8f, 0xd0, 0xbd, 0x9f, 0xa1, 0xbb, 0xc7, 0x2c, 0x05, 0x3a, 0x09, 0xad, 0xba, 0x74, + 0x2c, 0xfa, 0x09, 0x8a, 0x3b, 0x92, 0x32, 0xe5, 0x1a, 0x8d, 0xe1, 0x21, 0x93, 0x8e, 0xef, 0xf7, + 0x7e, 0xff, 0xde, 0x3d, 0x52, 0xa0, 0x9b, 0x4a, 0x9e, 0xe0, 0x90, 0x0c, 0x8b, 0xdf, 0x09, 0x4e, + 0xd5, 0x19, 0x4b, 0xe2, 0x8a, 0x84, 0x4b, 0x0e, 0x77, 0x7c, 0xee, 0xbf, 0x48, 0x38, 0xf6, 0xa7, + 0x6e, 0x41, 0x71, 0x2b, 0xd4, 0x76, 0xbf, 0xcc, 0x27, 0x2c, 0x8c, 0x58, 0xf9, 0x23, 0x26, 0xc3, + 0xf8, 0x95, 0xef, 0xe7, 0x25, 0xda, 0x1f, 0xea, 0x74, 0x31, 0x19, 0x46, 0x4c, 0x92, 0x84, 0x61, + 0xea, 0x25, 0xf8, 0x54, 0x16, 0xc1, 0x0f, 0xca, 0x60, 0x4c, 0x24, 0x0e, 0xb0, 0xc4, 0x05, 0x0e, + 0x4b, 0xbc, 0x82, 0x39, 0x99, 0x8c, 0xe8, 0x70, 0x4a, 0xfd, 0xa1, 0x8c, 0x62, 0x92, 0x4a, 0x1c, + 0x8b, 0x22, 0x72, 0x3b, 0xe4, 0x21, 0xd7, 0xc7, 0xa1, 0x3a, 0xe5, 0x68, 0xff, 0xe7, 0x3a, 0xb8, + 0x81, 0x88, 0xa0, 0x91, 0x8f, 0xc7, 0x6a, 0x25, 0x78, 0x1f, 0x40, 0xd5, 0xda, 0xc3, 0x42, 0xd0, + 0x88, 0x04, 0x5e, 0xc4, 0x02, 0x32, 0x73, 0x8c, 0x9e, 0x31, 0xb0, 0x50, 0x4b, 0x45, 0x1e, 0xe6, + 0x81, 0x27, 0x0a, 0x87, 0x2e, 0x78, 0x9f, 0x12, 0x9c, 0x92, 0x0b, 0xf4, 0x9a, 0xa6, 0xbf, 0xa7, + 0x43, 0x6b, 0xfc, 0x2f, 0x80, 0x15, 0x90, 0xd4, 0x77, 0xcc, 0x9e, 0x31, 0xb0, 0x77, 0xfb, 0xee, + 0xb9, 0x72, 0xc5, 0x2e, 0x2e, 0xc2, 0x2c, 0x24, 0x07, 0x24, 0xf5, 0x93, 0x48, 0x48, 0x9e, 0x20, + 0xcd, 0x87, 0x2e, 0xa8, 0xeb, 0x62, 0x8e, 0xa5, 0x13, 0x9d, 0x4b, 0x12, 0x8f, 0x55, 0x1c, 0xe5, + 0x34, 0xf8, 0x15, 0xd8, 0x96, 0x49, 0xc6, 0x7c, 0x2c, 0x49, 0xe0, 0xe9, 0xbb, 0x72, 0xea, 0x3a, + 0xf3, 0xde, 0xa5, 0x2d, 0x4f, 0xe5, 0x49, 0xc9, 0xd6, 0x2a, 0xa0, 0x5b, 0x72, 0xed, 0x19, 0x72, + 0x70, 0x23, 0xf4, 0x3d, 0x39, 0x4d, 0x48, 0x3a, 0xe5, 0x34, 0x70, 0x36, 0x75, 0xb1, 0x9d, 0x4a, + 0x31, 0xa5, 0xbb, 0x3b, 0xa5, 0xbe, 0x7b, 0x52, 0xea, 0x3e, 0xfa, 0x64, 0xb9, 0xe8, 0xda, 0x8f, + 0xf7, 0x4f, 0xca, 0xac, 0x7f, 0x16, 0xdd, 0xf6, 0x2a, 0x21, 0x98, 0xec, 0xf5, 0x13, 0xcc, 0x02, + 0x96, 0x51, 0x8a, 0x27, 0x94, 0xf4, 0x91, 0x1d, 0xfa, 0x2b, 0x2a, 0x1c, 0x81, 0xba, 0x1a, 0x3b, + 0x75, 0xb6, 0x74, 0xa7, 0xfb, 0xee, 0x7f, 0x3d, 0x96, 0xfb, 0xc8, 0x2d, 0xed, 0xe4, 0x3e, 0xfd, + 0x7a, 0x7f, 0x5f, 0x4d, 0x9b, 0xa2, 0x3c, 0x15, 0xfe, 0x60, 0x80, 0x3b, 0x72, 0xc6, 0xbc, 0x54, + 0x60, 0xe6, 0xad, 0x8d, 0xdf, 0xbc, 0xca, 0xf8, 0x9f, 0x2d, 0x17, 0x5d, 0x78, 0x32, 0x63, 0x63, + 0x81, 0xd9, 0xd5, 0xb7, 0x80, 0xb2, 0xc8, 0xa8, 0x2c, 0xf3, 0x39, 0xb8, 0x9b, 0xa5, 0x11, 0x0b, + 0x57, 0x2e, 0xd1, 0x37, 0xe2, 0xbd, 0x20, 0x73, 0xc7, 0xee, 0x19, 0x83, 0x06, 0xba, 0xad, 0xc3, + 0x85, 0x53, 0xb4, 0xe2, 0x47, 0x64, 0xbe, 0x67, 0xfd, 0xf5, 0x53, 0xd7, 0x38, 0xb4, 0x1a, 0x8d, + 0x56, 0xf3, 0xd0, 0x6a, 0x80, 0x96, 0xdd, 0xff, 0xb5, 0x06, 0x9a, 0xda, 0x20, 0x4f, 0xd8, 0x29, + 0x87, 0x47, 0xb9, 0x46, 0x44, 0xbb, 0xd3, 0xde, 0xfd, 0xd8, 0xfd, 0xdf, 0xf7, 0xd0, 0xad, 0xda, + 0x7c, 0xd4, 0x38, 0x5b, 0x74, 0x37, 0xde, 0x2c, 0xba, 0x46, 0x2e, 0x16, 0x81, 0x3b, 0x00, 0x50, + 0x9c, 0xca, 0x35, 0x03, 0x37, 0x15, 0x92, 0x1b, 0xb7, 0x0b, 0x6c, 0x96, 0xc5, 0x9e, 0x20, 0x2c, + 0x88, 0x58, 0xa8, 0xfd, 0x6b, 0x21, 0xc0, 0xb2, 0xf8, 0x59, 0x8e, 0x94, 0x84, 0x20, 0xe1, 0x42, + 0x90, 0x40, 0xbb, 0x2d, 0x27, 0x1c, 0xe4, 0x08, 0xec, 0x83, 0x9b, 0xfa, 0xc5, 0xa2, 0x3c, 0xf4, + 0xd2, 0xe8, 0x35, 0xd1, 0x1e, 0x32, 0x91, 0xad, 0xc0, 0x63, 0x1e, 0x8e, 0xa3, 0xd7, 0x04, 0x3e, + 0x00, 0x6d, 0x2c, 0x44, 0xc2, 0x67, 0x51, 0xac, 0x04, 0x12, 0x09, 0x17, 0x3c, 0xc5, 0xd4, 0x7b, + 0x99, 0x71, 0x89, 0xb5, 0x15, 0x4c, 0xe4, 0x54, 0x18, 0xcf, 0x0a, 0xc2, 0x73, 0x15, 0x87, 0x1f, + 0x81, 0xed, 0x44, 0x89, 0xe3, 0xc5, 0x78, 0xe6, 0x4d, 0xe6, 0x92, 0xa4, 0x4e, 0x43, 0xa7, 0xdc, + 0xd4, 0xf0, 0x53, 0x3c, 0x1b, 0x29, 0x70, 0xa5, 0xab, 0xd5, 0xaa, 0x1f, 0x5a, 0x8d, 0x66, 0x0b, + 0xf4, 0xff, 0xae, 0x83, 0x3b, 0xfb, 0x3c, 0x8e, 0x31, 0x0b, 0x9e, 0x67, 0x24, 0x23, 0xe9, 0x98, + 0x61, 0x91, 0x4e, 0xb9, 0x84, 0x0f, 0x41, 0x73, 0xf5, 0x21, 0x29, 0x74, 0x7e, 0x8b, 0x6d, 0x2c, + 0xa5, 0x2c, 0x3a, 0xcf, 0x82, 0xdf, 0x02, 0x40, 0xb9, 0x8f, 0xe9, 0xd8, 0xe7, 0x82, 0x38, 0xb5, + 0x9e, 0x39, 0xb0, 0x77, 0x0f, 0xde, 0x72, 0x57, 0x97, 0x0e, 0xe3, 0x1e, 0xaf, 0xca, 0x3c, 0x62, + 0x32, 0x99, 0x17, 0xad, 0x2a, 0xd5, 0x61, 0x0c, 0xec, 0x90, 0xf2, 0x49, 0xd9, 0xcc, 0xd4, 0xcd, + 0x1e, 0x5d, 0xab, 0xd9, 0xe3, 0xf3, 0x3a, 0xd5, 0x6e, 0xd5, 0xfa, 0xed, 0x5f, 0x0c, 0xb0, 0x55, + 0x64, 0xc3, 0x5b, 0xa0, 0x16, 0x05, 0x5a, 0x22, 0x13, 0xd5, 0xa2, 0x00, 0xb6, 0x80, 0xa9, 0x0c, + 0xae, 0x9c, 0xd4, 0x44, 0xea, 0x08, 0xef, 0x82, 0x2d, 0xc2, 0x02, 0x6d, 0x7b, 0x53, 0xa3, 0x9b, + 0x84, 0x05, 0x47, 0x64, 0x0e, 0xdb, 0xa0, 0x91, 0x10, 0x1c, 0x70, 0x46, 0xe7, 0xfa, 0x03, 0xd7, + 0x40, 0xab, 0xe7, 0xf5, 0x0b, 0xa8, 0x5f, 0xeb, 0x02, 0x1c, 0xb0, 0x25, 0x12, 0x92, 0x90, 0x97, + 0xa9, 0xb3, 0xd9, 0x33, 0x07, 0x26, 0x2a, 0x1f, 0xdb, 0xdf, 0x81, 0xed, 0x0b, 0x9a, 0x96, 0x63, + 0xe7, 0x7b, 0xe8, 0xb1, 0x11, 0xa8, 0xbf, 0xc2, 0x34, 0x23, 0x7a, 0x15, 0x7b, 0xf7, 0xc1, 0xb5, + 0xd4, 0x2c, 0x50, 0x94, 0x97, 0xda, 0xab, 0x7d, 0x69, 0xb4, 0xbf, 0x07, 0xad, 0x8b, 0x1a, 0xbf, + 0xbb, 0xee, 0xa3, 0x7b, 0x67, 0x7f, 0x74, 0x36, 0xce, 0x96, 0x1d, 0xe3, 0xcd, 0xb2, 0x63, 0xfc, + 0xb6, 0xec, 0x18, 0xbf, 0x2f, 0x3b, 0xc6, 0x8f, 0x7f, 0x76, 0x36, 0xbe, 0xb1, 0x2b, 0xf5, 0x26, + 0x9b, 0xfa, 0x6f, 0xf2, 0xd3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x43, 0xe5, 0xaf, 0x05, 0x08, 0x00, 0x00, } diff --git a/pkg/storage/storagebase/state.proto b/pkg/storage/storagebase/state.proto index 951c9b4a3d19..7912249cecfc 100644 --- a/pkg/storage/storagebase/state.proto +++ b/pkg/storage/storagebase/state.proto @@ -90,7 +90,6 @@ message RangeInfo { // The highest (and last) index in the Raft log. uint64 last_index = 2; uint64 num_pending = 3; - uint64 num_remote_pending = 9; reserved 4; // previously last verification timestamp for verify queue. uint64 num_dropped = 5; // raft_log_size may be initially inaccurate after a server restart. @@ -100,6 +99,7 @@ message RangeInfo { int64 approximate_proposal_quota = 7; // The max size the range can grow to before it will be split. int64 range_max_bytes = 8; + reserved 9; } // CommandQueueSnapshot is a snapshot of the command queue graph for rendering diff --git a/pkg/storage/store.go b/pkg/storage/store.go index 5d8f53258c72..af926307c083 100644 --- a/pkg/storage/store.go +++ b/pkg/storage/store.go @@ -167,14 +167,15 @@ func newRaftConfig( strg raft.Storage, id uint64, appliedIndex uint64, storeCfg StoreConfig, logger raft.Logger, ) *raft.Config { return &raft.Config{ - ID: id, - Applied: appliedIndex, - ElectionTick: storeCfg.RaftElectionTimeoutTicks, - HeartbeatTick: storeCfg.RaftHeartbeatIntervalTicks, - MaxSizePerMsg: storeCfg.RaftMaxSizePerMsg, - MaxInflightMsgs: storeCfg.RaftMaxInflightMsgs, - Storage: strg, - Logger: logger, + ID: id, + Applied: appliedIndex, + ElectionTick: storeCfg.RaftElectionTimeoutTicks, + HeartbeatTick: storeCfg.RaftHeartbeatIntervalTicks, + MaxUncommittedEntriesSize: storeCfg.RaftMaxUncommittedEntriesSize, + MaxSizePerMsg: storeCfg.RaftMaxSizePerMsg, + MaxInflightMsgs: storeCfg.RaftMaxInflightMsgs, + Storage: strg, + Logger: logger, PreVote: true, } diff --git a/pkg/ui/src/views/reports/containers/range/rangeTable.tsx b/pkg/ui/src/views/reports/containers/range/rangeTable.tsx index 185d9aa949a4..7f205e38c6f2 100644 --- a/pkg/ui/src/views/reports/containers/range/rangeTable.tsx +++ b/pkg/ui/src/views/reports/containers/range/rangeTable.tsx @@ -74,8 +74,7 @@ const rangeTableDisplayList: RangeTableRow[] = [ { variable: "leaseHolderQPS", display: "Lease Holder QPS", compareToLeader: false }, { variable: "keysWrittenPS", display: "Average Keys Written Per Second", compareToLeader: false }, { variable: "approxProposalQuota", display: "Approx Proposal Quota", compareToLeader: false }, - { variable: "pendingCommands", display: "Pending Local Commands", compareToLeader: false }, - { variable: "remoteCommands", display: "Pending Remote Commands", compareToLeader: false }, + { variable: "pendingCommands", display: "Pending Commands", compareToLeader: false }, { variable: "droppedCommands", display: "Dropped Commands", compareToLeader: false }, { variable: "truncatedIndex", display: "Truncated Index", compareToLeader: true }, { variable: "truncatedTerm", display: "Truncated Term", compareToLeader: true }, @@ -506,7 +505,6 @@ export default class RangeTable extends React.Component { keysWrittenPS: this.createContent(info.stats.writes_per_second.toFixed(4)), approxProposalQuota: raftLeader ? this.createContent(FixLong(info.state.approximate_proposal_quota)) : rangeTableEmptyContent, pendingCommands: this.createContent(FixLong(info.state.num_pending)), - remoteCommands: raftLeader ? this.createContent(FixLong(info.state.num_remote_pending)) : rangeTableEmptyContent, droppedCommands: this.createContent( FixLong(info.state.num_dropped), FixLong(info.state.num_dropped).greaterThan(0) ? "range-table__cell--warning" : "",