mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-05-22 15:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
William Banfield
2022-02-18 13:37:17 -05:00
parent e2d0a4cc46
commit fe09d74545
2 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/consensus/metrics.go
View File

@@ -6,11 +6,7 @@ import (
"github.com/go-kit/kit/metrics"
"github.com/go-kit/kit/metrics/discard"
<<<<<<< HEAD
=======
cstypes "github.com/tendermint/tendermint/internal/consensus/types"
>>>>>>> 165cc2947 (consensus: additional timing metrics (#7849))
"github.com/tendermint/tendermint/types"
prometheus "github.com/go-kit/kit/metrics/prometheus"
@@ -294,7 +290,6 @@ func NopMetrics() *Metrics {
BlockIntervalSeconds: discard.NewHistogram(),
<<<<<<< HEAD
NumTxs: discard.NewGauge(),
BlockSizeBytes: discard.NewHistogram(),
TotalTxs: discard.NewGauge(),
@@ -302,22 +297,10 @@ func NopMetrics() *Metrics {
BlockSyncing: discard.NewGauge(),
StateSyncing: discard.NewGauge(),
BlockParts: discard.NewCounter(),
BlockGossipReceiveLatency: discard.NewHistogram(),
BlockGossipPartsReceived: discard.NewCounter(),
QuorumPrevoteMessageDelay: discard.NewGauge(),
FullPrevoteMessageDelay: discard.NewGauge(),
=======
NumTxs: discard.NewGauge(),
BlockSizeBytes: discard.NewHistogram(),
TotalTxs: discard.NewGauge(),
CommittedHeight: discard.NewGauge(),
BlockSyncing: discard.NewGauge(),
StateSyncing: discard.NewGauge(),
BlockParts: discard.NewCounter(),
BlockGossipReceiveLatency: discard.NewHistogram(),
BlockGossipPartsReceived: discard.NewCounter(),
QuorumPrevoteMessageDelay: discard.NewGauge(),
FullPrevoteMessageDelay: discard.NewGauge(),
ProposalTimestampDifference: discard.NewHistogram(),
>>>>>>> 165cc2947 (consensus: additional timing metrics (#7849))
}
}

10
internal/consensus/state.go
View File

@@ -1880,12 +1880,8 @@ func (cs *State) addProposalBlockPart(msg *BlockPartMessage, peerID types.NodeID
// Blocks might be reused, so round mismatch is OK
if cs.Height != height {
<<<<<<< HEAD
cs.Logger.Debug("received block part from wrong height", "height", height, "round", round)
=======
cs.logger.Debug("received block part from wrong height", "height", height, "round", round)
cs.metrics.BlockGossipPartsReceived.With("matches_current", "false").Add(1)
>>>>>>> 165cc2947 (consensus: additional timing metrics (#7849))
return false, nil
}
@@ -1920,12 +1916,8 @@ func (cs *State) addProposalBlockPart(msg *BlockPartMessage, peerID types.NodeID
)
}
if added && cs.ProposalBlockParts.IsComplete() {
<<<<<<< HEAD
bz, err := ioutil.ReadAll(cs.ProposalBlockParts.GetReader())
=======
cs.metrics.MarkBlockGossipComplete()
bz, err := io.ReadAll(cs.ProposalBlockParts.GetReader())
>>>>>>> 165cc2947 (consensus: additional timing metrics (#7849))
bz, err := ioutil.ReadAll(cs.ProposalBlockParts.GetReader())
if err != nil {
return added, err
}