-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* go routines in blockchain reactor * Added reference to the go routine diagram * Initial commit * cleanup * Undo testing_logger change, committed by mistake * Fix the test loggers * pulled some fsm code into pool.go * added pool tests * changes to the design added block requests under peer moved the request trigger in the reactor poolRoutine, triggered now by a ticker in general moved everything required for making block requests smarter in the poolRoutine added a simple map of heights to keep track of what will need to be requested next added a few more tests * send errors to FSM in a different channel than blocks send errors (RemovePeer) from switch on a different channel than the one receiving blocks renamed channels added more pool tests * more pool tests * lint errors * more tests * more tests * switch fast sync to new implementation * fixed data race in tests * cleanup * finished fsm tests * address golangci comments :) * address golangci comments :) * Added timeout on next block needed to advance * updating docs and cleanup * fix issue in test from previous cleanup * cleanup * Added termination scenarios, tests and more cleanup * small fixes to adr, comments and cleanup * Fix bug in sendRequest() If we tried to send a request to a peer not present in the switch, a missing continue statement caused the request to be blackholed in a peer that was removed and never retried. While this bug was manifesting, the reactor kept asking for other blocks that would be stored and never consumed. Added the number of unconsumed blocks in the math for requesting blocks ahead of current processing height so eventually there will be no more blocks requested until the already received ones are consumed. * remove bpPeer's didTimeout field * Use distinct err codes for peer timeout and FSM timeouts * Don't allow peers to update with lower height * review comments from Ethan and Zarko * some cleanup, renaming, comments * Move block execution in separate goroutine * Remove pool's numPending * review comments * fix lint, remove old blockchain reactor and duplicates in fsm tests * small reorg around peer after review comments * add the reactor spec * verify block only once * review comments * change to int for max number of pending requests * cleanup and godoc * Add configuration flag fast sync version * golangci fixes * fix config template * move both reactor versions under blockchain * cleanup, golint, renaming stuff * updated documentation, fixed more golint warnings * integrate with behavior package * sync with master * gofmt * add changelog_pending entry * move to improvments * suggestion to changelog entry
- Loading branch information
1 parent
756440e
commit 4d7cd80
Showing
34 changed files
with
4,275 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package blockchain | ||
| package v0 | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package blockchain | ||
| package v0 | ||
|
|
||
| import ( | ||
| amino "github.com/tendermint/go-amino" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,209 @@ | ||
| package v1 | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "math" | ||
| "time" | ||
|
|
||
| flow "github.com/tendermint/tendermint/libs/flowrate" | ||
| "github.com/tendermint/tendermint/libs/log" | ||
| "github.com/tendermint/tendermint/p2p" | ||
| "github.com/tendermint/tendermint/types" | ||
| ) | ||
|
|
||
| //-------- | ||
| // Peer | ||
|
|
||
| // BpPeerParams stores the peer parameters that are used when creating a peer. | ||
| type BpPeerParams struct { | ||
| timeout time.Duration | ||
| minRecvRate int64 | ||
| sampleRate time.Duration | ||
| windowSize time.Duration | ||
| } | ||
|
|
||
| // BpPeer is the datastructure associated with a fast sync peer. | ||
| type BpPeer struct { | ||
| logger log.Logger | ||
| ID p2p.ID | ||
|
|
||
| Height int64 // the peer reported height | ||
| NumPendingBlockRequests int // number of requests still waiting for block responses | ||
| blocks map[int64]*types.Block // blocks received or expected to be received from this peer | ||
| blockResponseTimer *time.Timer | ||
| recvMonitor *flow.Monitor | ||
| params *BpPeerParams // parameters for timer and monitor | ||
|
|
||
| onErr func(err error, peerID p2p.ID) // function to call on error | ||
| } | ||
|
|
||
| // NewBpPeer creates a new peer. | ||
| func NewBpPeer( | ||
| peerID p2p.ID, height int64, onErr func(err error, peerID p2p.ID), params *BpPeerParams) *BpPeer { | ||
|
|
||
| if params == nil { | ||
| params = BpPeerDefaultParams() | ||
| } | ||
| return &BpPeer{ | ||
| ID: peerID, | ||
| Height: height, | ||
| blocks: make(map[int64]*types.Block, maxRequestsPerPeer), | ||
| logger: log.NewNopLogger(), | ||
| onErr: onErr, | ||
| params: params, | ||
| } | ||
| } | ||
|
|
||
| // String returns a string representation of a peer. | ||
| func (peer *BpPeer) String() string { | ||
| return fmt.Sprintf("peer: %v height: %v pending: %v", peer.ID, peer.Height, peer.NumPendingBlockRequests) | ||
| } | ||
|
|
||
| // SetLogger sets the logger of the peer. | ||
| func (peer *BpPeer) SetLogger(l log.Logger) { | ||
| peer.logger = l | ||
| } | ||
|
|
||
| // Cleanup performs cleanup of the peer, removes blocks, requests, stops timer and monitor. | ||
| func (peer *BpPeer) Cleanup() { | ||
| if peer.blockResponseTimer != nil { | ||
| peer.blockResponseTimer.Stop() | ||
| } | ||
| if peer.NumPendingBlockRequests != 0 { | ||
| peer.logger.Info("peer with pending requests is being cleaned", "peer", peer.ID) | ||
| } | ||
| if len(peer.blocks)-peer.NumPendingBlockRequests != 0 { | ||
| peer.logger.Info("peer with pending blocks is being cleaned", "peer", peer.ID) | ||
| } | ||
| for h := range peer.blocks { | ||
| delete(peer.blocks, h) | ||
| } | ||
| peer.NumPendingBlockRequests = 0 | ||
| peer.recvMonitor = nil | ||
| } | ||
|
|
||
| // BlockAtHeight returns the block at a given height if available and errMissingBlock otherwise. | ||
| func (peer *BpPeer) BlockAtHeight(height int64) (*types.Block, error) { | ||
| block, ok := peer.blocks[height] | ||
| if !ok { | ||
| return nil, errMissingBlock | ||
| } | ||
| if block == nil { | ||
| return nil, errMissingBlock | ||
| } | ||
| return peer.blocks[height], nil | ||
| } | ||
|
|
||
| // AddBlock adds a block at peer level. Block must be non-nil and recvSize a positive integer | ||
| // The peer must have a pending request for this block. | ||
| func (peer *BpPeer) AddBlock(block *types.Block, recvSize int) error { | ||
| if block == nil || recvSize < 0 { | ||
| panic("bad parameters") | ||
| } | ||
| existingBlock, ok := peer.blocks[block.Height] | ||
| if !ok { | ||
| peer.logger.Error("unsolicited block", "blockHeight", block.Height, "peer", peer.ID) | ||
| return errMissingBlock | ||
| } | ||
| if existingBlock != nil { | ||
| peer.logger.Error("already have a block for height", "height", block.Height) | ||
| return errDuplicateBlock | ||
| } | ||
| if peer.NumPendingBlockRequests == 0 { | ||
| panic("peer does not have pending requests") | ||
| } | ||
| peer.blocks[block.Height] = block | ||
| peer.NumPendingBlockRequests-- | ||
| if peer.NumPendingBlockRequests == 0 { | ||
| peer.stopMonitor() | ||
| peer.stopBlockResponseTimer() | ||
| } else { | ||
| peer.recvMonitor.Update(recvSize) | ||
| peer.resetBlockResponseTimer() | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // RemoveBlock removes the block of given height | ||
| func (peer *BpPeer) RemoveBlock(height int64) { | ||
| delete(peer.blocks, height) | ||
| } | ||
|
|
||
| // RequestSent records that a request was sent, and starts the peer timer and monitor if needed. | ||
| func (peer *BpPeer) RequestSent(height int64) { | ||
| peer.blocks[height] = nil | ||
|
|
||
| if peer.NumPendingBlockRequests == 0 { | ||
| peer.startMonitor() | ||
| peer.resetBlockResponseTimer() | ||
| } | ||
| peer.NumPendingBlockRequests++ | ||
| } | ||
|
|
||
| // CheckRate verifies that the response rate of the peer is acceptable (higher than the minimum allowed). | ||
| func (peer *BpPeer) CheckRate() error { | ||
| if peer.NumPendingBlockRequests == 0 { | ||
| return nil | ||
| } | ||
| curRate := peer.recvMonitor.Status().CurRate | ||
| // curRate can be 0 on start | ||
| if curRate != 0 && curRate < peer.params.minRecvRate { | ||
| err := errSlowPeer | ||
| peer.logger.Error("SendTimeout", "peer", peer, | ||
| "reason", err, | ||
| "curRate", fmt.Sprintf("%d KB/s", curRate/1024), | ||
| "minRate", fmt.Sprintf("%d KB/s", peer.params.minRecvRate/1024)) | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (peer *BpPeer) onTimeout() { | ||
| peer.onErr(errNoPeerResponse, peer.ID) | ||
| } | ||
|
|
||
| func (peer *BpPeer) stopMonitor() { | ||
| peer.recvMonitor.Done() | ||
| peer.recvMonitor = nil | ||
| } | ||
|
|
||
| func (peer *BpPeer) startMonitor() { | ||
| peer.recvMonitor = flow.New(peer.params.sampleRate, peer.params.windowSize) | ||
| initialValue := float64(peer.params.minRecvRate) * math.E | ||
| peer.recvMonitor.SetREMA(initialValue) | ||
| } | ||
|
|
||
| func (peer *BpPeer) resetBlockResponseTimer() { | ||
| if peer.blockResponseTimer == nil { | ||
| peer.blockResponseTimer = time.AfterFunc(peer.params.timeout, peer.onTimeout) | ||
| } else { | ||
| peer.blockResponseTimer.Reset(peer.params.timeout) | ||
| } | ||
| } | ||
|
|
||
| func (peer *BpPeer) stopBlockResponseTimer() bool { | ||
| if peer.blockResponseTimer == nil { | ||
| return false | ||
| } | ||
| return peer.blockResponseTimer.Stop() | ||
| } | ||
|
|
||
| // BpPeerDefaultParams returns the default peer parameters. | ||
| func BpPeerDefaultParams() *BpPeerParams { | ||
| return &BpPeerParams{ | ||
| // Timeout for a peer to respond to a block request. | ||
| timeout: 15 * time.Second, | ||
|
|
||
| // Minimum recv rate to ensure we're receiving blocks from a peer fast | ||
| // enough. If a peer is not sending data at at least that rate, we | ||
| // consider them to have timedout and we disconnect. | ||
| // | ||
| // Assuming a DSL connection (not a good choice) 128 Kbps (upload) ~ 15 KB/s, | ||
| // sending data across atlantic ~ 7.5 KB/s. | ||
| minRecvRate: int64(7680), | ||
|
|
||
| // Monitor parameters | ||
| sampleRate: time.Second, | ||
| windowSize: 40 * time.Second, | ||
| } | ||
| } |
Oops, something went wrong.