You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

506 lines
16 KiB

7 years ago
7 years ago
7 years ago
lint: Enable Golint (#4212) * Fix many golint errors * Fix golint errors in the 'lite' package * Don't export Pool.store * Fix typo * Revert unwanted changes * Fix errors in counter package * Fix linter errors in kvstore package * Fix linter error in example package * Fix error in tests package * Fix linter errors in v2 package * Fix linter errors in consensus package * Fix linter errors in evidence package * Fix linter error in fail package * Fix linter errors in query package * Fix linter errors in core package * Fix linter errors in node package * Fix linter errors in mempool package * Fix linter error in conn package * Fix linter errors in pex package * Rename PEXReactor export to Reactor * Fix linter errors in trust package * Fix linter errors in upnp package * Fix linter errors in p2p package * Fix linter errors in proxy package * Fix linter errors in mock_test package * Fix linter error in client_test package * Fix linter errors in coretypes package * Fix linter errors in coregrpc package * Fix linter errors in rpcserver package * Fix linter errors in rpctypes package * Fix linter errors in rpctest package * Fix linter error in json2wal script * Fix linter error in wal2json script * Fix linter errors in kv package * Fix linter error in state package * Fix linter error in grpc_client * Fix linter errors in types package * Fix linter error in version package * Fix remaining errors * Address review comments * Fix broken tests * Reconcile package coregrpc * Fix golangci bot error * Fix new golint errors * Fix broken reference * Enable golint linter * minor changes to bring golint into line * fix failing test * fix pex reactor naming * address PR comments
5 years ago
7 years ago
8 years ago
pubsub 2.0 (#3227) * green pubsub tests :OK: * get rid of clientToQueryMap * Subscribe and SubscribeUnbuffered * start adapting other pkgs to new pubsub * nope * rename MsgAndTags to Message * remove TagMap it does not bring any additional benefits * bring back EventSubscriber * fix test * fix data race in TestStartNextHeightCorrectly ``` Write at 0x00c0001c7418 by goroutine 796: github.com/tendermint/tendermint/consensus.TestStartNextHeightCorrectly() /go/src/github.com/tendermint/tendermint/consensus/state_test.go:1296 +0xad testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 Previous read at 0x00c0001c7418 by goroutine 858: github.com/tendermint/tendermint/consensus.(*ConsensusState).addVote() /go/src/github.com/tendermint/tendermint/consensus/state.go:1631 +0x1366 github.com/tendermint/tendermint/consensus.(*ConsensusState).tryAddVote() /go/src/github.com/tendermint/tendermint/consensus/state.go:1476 +0x8f github.com/tendermint/tendermint/consensus.(*ConsensusState).handleMsg() /go/src/github.com/tendermint/tendermint/consensus/state.go:667 +0xa1e github.com/tendermint/tendermint/consensus.(*ConsensusState).receiveRoutine() /go/src/github.com/tendermint/tendermint/consensus/state.go:628 +0x794 Goroutine 796 (running) created at: testing.(*T).Run() /usr/local/go/src/testing/testing.go:878 +0x659 testing.runTests.func1() /usr/local/go/src/testing/testing.go:1119 +0xa8 testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 testing.runTests() /usr/local/go/src/testing/testing.go:1117 +0x4ee testing.(*M).Run() /usr/local/go/src/testing/testing.go:1034 +0x2ee main.main() _testmain.go:214 +0x332 Goroutine 858 (running) created at: github.com/tendermint/tendermint/consensus.(*ConsensusState).startRoutines() /go/src/github.com/tendermint/tendermint/consensus/state.go:334 +0x221 github.com/tendermint/tendermint/consensus.startTestRound() /go/src/github.com/tendermint/tendermint/consensus/common_test.go:122 +0x63 github.com/tendermint/tendermint/consensus.TestStateFullRound1() /go/src/github.com/tendermint/tendermint/consensus/state_test.go:255 +0x397 testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 ``` * fixes after my own review * fix formatting * wait 100ms before kicking a subscriber out + a test for indexer_service * fixes after my second review * no timeout * add changelog entries * fix merge conflicts * fix typos after Thane's review Co-Authored-By: melekes <anton.kalyaev@gmail.com> * reformat code * rewrite indexer service in the attempt to fix failing test https://github.com/tendermint/tendermint/pull/3227/#issuecomment-462316527 * Revert "rewrite indexer service in the attempt to fix failing test" This reverts commit 0d9107a098230de7138abb1c201877c246e89ed1. * another attempt to fix indexer * fixes after Ethan's review * use unbuffered channel when indexing transactions Refs https://github.com/tendermint/tendermint/pull/3227#discussion_r258786716 * add a comment for EventBus#SubscribeUnbuffered * format code
6 years ago
pubsub 2.0 (#3227) * green pubsub tests :OK: * get rid of clientToQueryMap * Subscribe and SubscribeUnbuffered * start adapting other pkgs to new pubsub * nope * rename MsgAndTags to Message * remove TagMap it does not bring any additional benefits * bring back EventSubscriber * fix test * fix data race in TestStartNextHeightCorrectly ``` Write at 0x00c0001c7418 by goroutine 796: github.com/tendermint/tendermint/consensus.TestStartNextHeightCorrectly() /go/src/github.com/tendermint/tendermint/consensus/state_test.go:1296 +0xad testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 Previous read at 0x00c0001c7418 by goroutine 858: github.com/tendermint/tendermint/consensus.(*ConsensusState).addVote() /go/src/github.com/tendermint/tendermint/consensus/state.go:1631 +0x1366 github.com/tendermint/tendermint/consensus.(*ConsensusState).tryAddVote() /go/src/github.com/tendermint/tendermint/consensus/state.go:1476 +0x8f github.com/tendermint/tendermint/consensus.(*ConsensusState).handleMsg() /go/src/github.com/tendermint/tendermint/consensus/state.go:667 +0xa1e github.com/tendermint/tendermint/consensus.(*ConsensusState).receiveRoutine() /go/src/github.com/tendermint/tendermint/consensus/state.go:628 +0x794 Goroutine 796 (running) created at: testing.(*T).Run() /usr/local/go/src/testing/testing.go:878 +0x659 testing.runTests.func1() /usr/local/go/src/testing/testing.go:1119 +0xa8 testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 testing.runTests() /usr/local/go/src/testing/testing.go:1117 +0x4ee testing.(*M).Run() /usr/local/go/src/testing/testing.go:1034 +0x2ee main.main() _testmain.go:214 +0x332 Goroutine 858 (running) created at: github.com/tendermint/tendermint/consensus.(*ConsensusState).startRoutines() /go/src/github.com/tendermint/tendermint/consensus/state.go:334 +0x221 github.com/tendermint/tendermint/consensus.startTestRound() /go/src/github.com/tendermint/tendermint/consensus/common_test.go:122 +0x63 github.com/tendermint/tendermint/consensus.TestStateFullRound1() /go/src/github.com/tendermint/tendermint/consensus/state_test.go:255 +0x397 testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 ``` * fixes after my own review * fix formatting * wait 100ms before kicking a subscriber out + a test for indexer_service * fixes after my second review * no timeout * add changelog entries * fix merge conflicts * fix typos after Thane's review Co-Authored-By: melekes <anton.kalyaev@gmail.com> * reformat code * rewrite indexer service in the attempt to fix failing test https://github.com/tendermint/tendermint/pull/3227/#issuecomment-462316527 * Revert "rewrite indexer service in the attempt to fix failing test" This reverts commit 0d9107a098230de7138abb1c201877c246e89ed1. * another attempt to fix indexer * fixes after Ethan's review * use unbuffered channel when indexing transactions Refs https://github.com/tendermint/tendermint/pull/3227#discussion_r258786716 * add a comment for EventBus#SubscribeUnbuffered * format code
6 years ago
pubsub 2.0 (#3227) * green pubsub tests :OK: * get rid of clientToQueryMap * Subscribe and SubscribeUnbuffered * start adapting other pkgs to new pubsub * nope * rename MsgAndTags to Message * remove TagMap it does not bring any additional benefits * bring back EventSubscriber * fix test * fix data race in TestStartNextHeightCorrectly ``` Write at 0x00c0001c7418 by goroutine 796: github.com/tendermint/tendermint/consensus.TestStartNextHeightCorrectly() /go/src/github.com/tendermint/tendermint/consensus/state_test.go:1296 +0xad testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 Previous read at 0x00c0001c7418 by goroutine 858: github.com/tendermint/tendermint/consensus.(*ConsensusState).addVote() /go/src/github.com/tendermint/tendermint/consensus/state.go:1631 +0x1366 github.com/tendermint/tendermint/consensus.(*ConsensusState).tryAddVote() /go/src/github.com/tendermint/tendermint/consensus/state.go:1476 +0x8f github.com/tendermint/tendermint/consensus.(*ConsensusState).handleMsg() /go/src/github.com/tendermint/tendermint/consensus/state.go:667 +0xa1e github.com/tendermint/tendermint/consensus.(*ConsensusState).receiveRoutine() /go/src/github.com/tendermint/tendermint/consensus/state.go:628 +0x794 Goroutine 796 (running) created at: testing.(*T).Run() /usr/local/go/src/testing/testing.go:878 +0x659 testing.runTests.func1() /usr/local/go/src/testing/testing.go:1119 +0xa8 testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 testing.runTests() /usr/local/go/src/testing/testing.go:1117 +0x4ee testing.(*M).Run() /usr/local/go/src/testing/testing.go:1034 +0x2ee main.main() _testmain.go:214 +0x332 Goroutine 858 (running) created at: github.com/tendermint/tendermint/consensus.(*ConsensusState).startRoutines() /go/src/github.com/tendermint/tendermint/consensus/state.go:334 +0x221 github.com/tendermint/tendermint/consensus.startTestRound() /go/src/github.com/tendermint/tendermint/consensus/common_test.go:122 +0x63 github.com/tendermint/tendermint/consensus.TestStateFullRound1() /go/src/github.com/tendermint/tendermint/consensus/state_test.go:255 +0x397 testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 ``` * fixes after my own review * fix formatting * wait 100ms before kicking a subscriber out + a test for indexer_service * fixes after my second review * no timeout * add changelog entries * fix merge conflicts * fix typos after Thane's review Co-Authored-By: melekes <anton.kalyaev@gmail.com> * reformat code * rewrite indexer service in the attempt to fix failing test https://github.com/tendermint/tendermint/pull/3227/#issuecomment-462316527 * Revert "rewrite indexer service in the attempt to fix failing test" This reverts commit 0d9107a098230de7138abb1c201877c246e89ed1. * another attempt to fix indexer * fixes after Ethan's review * use unbuffered channel when indexing transactions Refs https://github.com/tendermint/tendermint/pull/3227#discussion_r258786716 * add a comment for EventBus#SubscribeUnbuffered * format code
6 years ago
8 years ago
8 years ago
8 years ago
7 years ago
lint: Enable Golint (#4212) * Fix many golint errors * Fix golint errors in the 'lite' package * Don't export Pool.store * Fix typo * Revert unwanted changes * Fix errors in counter package * Fix linter errors in kvstore package * Fix linter error in example package * Fix error in tests package * Fix linter errors in v2 package * Fix linter errors in consensus package * Fix linter errors in evidence package * Fix linter error in fail package * Fix linter errors in query package * Fix linter errors in core package * Fix linter errors in node package * Fix linter errors in mempool package * Fix linter error in conn package * Fix linter errors in pex package * Rename PEXReactor export to Reactor * Fix linter errors in trust package * Fix linter errors in upnp package * Fix linter errors in p2p package * Fix linter errors in proxy package * Fix linter errors in mock_test package * Fix linter error in client_test package * Fix linter errors in coretypes package * Fix linter errors in coregrpc package * Fix linter errors in rpcserver package * Fix linter errors in rpctypes package * Fix linter errors in rpctest package * Fix linter error in json2wal script * Fix linter error in wal2json script * Fix linter errors in kv package * Fix linter error in state package * Fix linter error in grpc_client * Fix linter errors in types package * Fix linter error in version package * Fix remaining errors * Address review comments * Fix broken tests * Reconcile package coregrpc * Fix golangci bot error * Fix new golint errors * Fix broken reference * Enable golint linter * minor changes to bring golint into line * fix failing test * fix pex reactor naming * address PR comments
5 years ago
7 years ago
7 years ago
lint: Enable Golint (#4212) * Fix many golint errors * Fix golint errors in the 'lite' package * Don't export Pool.store * Fix typo * Revert unwanted changes * Fix errors in counter package * Fix linter errors in kvstore package * Fix linter error in example package * Fix error in tests package * Fix linter errors in v2 package * Fix linter errors in consensus package * Fix linter errors in evidence package * Fix linter error in fail package * Fix linter errors in query package * Fix linter errors in core package * Fix linter errors in node package * Fix linter errors in mempool package * Fix linter error in conn package * Fix linter errors in pex package * Rename PEXReactor export to Reactor * Fix linter errors in trust package * Fix linter errors in upnp package * Fix linter errors in p2p package * Fix linter errors in proxy package * Fix linter errors in mock_test package * Fix linter error in client_test package * Fix linter errors in coretypes package * Fix linter errors in coregrpc package * Fix linter errors in rpcserver package * Fix linter errors in rpctypes package * Fix linter errors in rpctest package * Fix linter error in json2wal script * Fix linter error in wal2json script * Fix linter errors in kv package * Fix linter error in state package * Fix linter error in grpc_client * Fix linter errors in types package * Fix linter error in version package * Fix remaining errors * Address review comments * Fix broken tests * Reconcile package coregrpc * Fix golangci bot error * Fix new golint errors * Fix broken reference * Enable golint linter * minor changes to bring golint into line * fix failing test * fix pex reactor naming * address PR comments
5 years ago
7 years ago
8 years ago
8 years ago
7 years ago
8 years ago
8 years ago
WAL: better errors and new fail point (#3246) * privval: more info in errors * wal: change Debug logs to Info * wal: log and return error on corrupted wal instead of panicing * fail: Exit right away instead of sending interupt * consensus: FAIL before handling our own vote allows to replicate #3089: - run using `FAIL_TEST_INDEX=0` - delete some bytes from the end of the WAL - start normally Results in logs like: ``` I[2019-02-03|18:12:58.225] Searching for height module=consensus wal=/Users/ethanbuchman/.tendermint/data/cs.wal/wal height=1 min=0 max=0 E[2019-02-03|18:12:58.225] Error on catchup replay. Proceeding to start ConsensusState anyway module=consensus err="failed to read data: EOF" I[2019-02-03|18:12:58.225] Started node module=main nodeInfo="{ProtocolVersion:{P2P:6 Block:9 App:1} ID_:35e87e93f2e31f305b65a5517fd2102331b56002 ListenAddr:tcp://0.0.0.0:26656 Network:test-chain-J8JvJH Version:0.29.1 Channels:4020212223303800 Moniker:Ethans-MacBook-Pro.local Other:{TxIndex:on RPCAddress:tcp://0.0.0.0:26657}}" E[2019-02-03|18:12:58.226] Couldn't connect to any seeds module=p2p I[2019-02-03|18:12:59.229] Timed out module=consensus dur=998.568ms height=1 round=0 step=RoundStepNewHeight I[2019-02-03|18:12:59.230] enterNewRound(1/0). Current: 1/0/RoundStepNewHeight module=consensus height=1 round=0 I[2019-02-03|18:12:59.230] enterPropose(1/0). Current: 1/0/RoundStepNewRound module=consensus height=1 round=0 I[2019-02-03|18:12:59.230] enterPropose: Our turn to propose module=consensus height=1 round=0 proposer=AD278B7767B05D7FBEB76207024C650988FA77D5 privValidator="PrivValidator{AD278B7767B05D7FBEB76207024C650988FA77D5 LH:1, LR:0, LS:2}" E[2019-02-03|18:12:59.230] enterPropose: Error signing proposal module=consensus height=1 round=0 err="Error signing proposal: Step regression at height 1 round 0. Got 1, last step 2" I[2019-02-03|18:13:02.233] Timed out module=consensus dur=3s height=1 round=0 step=RoundStepPropose I[2019-02-03|18:13:02.233] enterPrevote(1/0). Current: 1/0/RoundStepPropose module=consensus I[2019-02-03|18:13:02.233] enterPrevote: ProposalBlock is nil module=consensus height=1 round=0 E[2019-02-03|18:13:02.234] Error signing vote module=consensus height=1 round=0 vote="Vote{0:AD278B7767B0 1/00/1(Prevote) 000000000000 000000000000 @ 2019-02-04T02:13:02.233897Z}" err="Error signing vote: Conflicting data" ``` Notice the EOF, the step regression, and the conflicting data. * wal: change errors to be DataCorruptionError * exit on corrupt WAL * fix log * fix new line
6 years ago
8 years ago
7 years ago
7 years ago
7 years ago
7 years ago
7 years ago
7 years ago
8 years ago
7 years ago
cs/replay: execCommitBlock should not read from state.lastValidators (#3067) * execCommitBlock should not read from state.lastValidators * fix height 1 * fix blockchain/reactor_test * fix consensus/mempool_test * fix consensus/reactor_test * fix consensus/replay_test * add CHANGELOG * fix consensus/reactor_test * fix consensus/replay_test * add a test for replay validators change * fix mem_pool test * fix byzantine test * remove a redundant code * reduce validator change blocks to 6 * fix * return peer0 config * seperate testName * seperate testName 1 * seperate testName 2 * seperate app db path * seperate app db path 1 * add a lock before startNet * move the lock to reactor_test * simulate just once * try to find problem * handshake only saveState when app version changed * update gometalinter to 3.0.0 (#3233) in the attempt to fix https://circleci.com/gh/tendermint/tendermint/43165 also code is simplified by running gofmt -s . remove unused vars enable linters we're currently passing remove deprecated linters (cherry picked from commit d47094550315c094512a242445e0dde24b5a03f5) * gofmt code * goimport code * change the bool name to testValidatorsChange * adjust receive kvstore.ProtocolVersion * adjust receive kvstore.ProtocolVersion 1 * adjust receive kvstore.ProtocolVersion 3 * fix merge execution.go * fix merge develop * fix merge develop 1 * fix run cleanupFunc * adjust code according to reviewers' opinion * modify the func name match the convention * simplify simulate a chain containing some validator change txs 1 * test CI error * Merge remote-tracking branch 'upstream/develop' into fixReplay 1 * fix pubsub_test * subscribeUnbuffered vote channel
6 years ago
7 years ago
7 years ago
7 years ago
add support for block pruning via ABCI Commit response (#4588) * Added BlockStore.DeleteBlock() * Added initial block pruner prototype * wip * Added BlockStore.PruneBlocks() * Added consensus setting for block pruning * Added BlockStore base * Error on replay if base does not have blocks * Handle missing blocks when sending VoteSetMaj23Message * Error message tweak * Properly update blockstore state * Error message fix again * blockchain: ignore peer missing blocks * Added FIXME * Added test for block replay with truncated history * Handle peer base in blockchain reactor * Improved replay error handling * Added tests for Store.PruneBlocks() * Fix non-RPC handling of truncated block history * Panic on missing block meta in needProofBlock() * Updated changelog * Handle truncated block history in RPC layer * Added info about earliest block in /status RPC * Reorder height and base in blockchain reactor messages * Updated changelog * Fix tests * Appease linter * Minor review fixes * Non-empty BlockStores should always have base > 0 * Update code to assume base > 0 invariant * Added blockstore tests for pruning to 0 * Make sure we don't prune below the current base * Added BlockStore.Size() * config: added retain_blocks recommendations * Update v1 blockchain reactor to handle blockstore base * Added state database pruning * Propagate errors on missing validator sets * Comment tweaks * Improved error message Co-Authored-By: Anton Kaliaev <anton.kalyaev@gmail.com> * use ABCI field ResponseCommit.retain_height instead of retain-blocks config option * remove State.RetainHeight, return value instead * fix minor issues * rename pruneHeights() to pruneBlocks() * noop to fix GitHub borkage Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
5 years ago
7 years ago
add support for block pruning via ABCI Commit response (#4588) * Added BlockStore.DeleteBlock() * Added initial block pruner prototype * wip * Added BlockStore.PruneBlocks() * Added consensus setting for block pruning * Added BlockStore base * Error on replay if base does not have blocks * Handle missing blocks when sending VoteSetMaj23Message * Error message tweak * Properly update blockstore state * Error message fix again * blockchain: ignore peer missing blocks * Added FIXME * Added test for block replay with truncated history * Handle peer base in blockchain reactor * Improved replay error handling * Added tests for Store.PruneBlocks() * Fix non-RPC handling of truncated block history * Panic on missing block meta in needProofBlock() * Updated changelog * Handle truncated block history in RPC layer * Added info about earliest block in /status RPC * Reorder height and base in blockchain reactor messages * Updated changelog * Fix tests * Appease linter * Minor review fixes * Non-empty BlockStores should always have base > 0 * Update code to assume base > 0 invariant * Added blockstore tests for pruning to 0 * Make sure we don't prune below the current base * Added BlockStore.Size() * config: added retain_blocks recommendations * Update v1 blockchain reactor to handle blockstore base * Added state database pruning * Propagate errors on missing validator sets * Comment tweaks * Improved error message Co-Authored-By: Anton Kaliaev <anton.kalyaev@gmail.com> * use ABCI field ResponseCommit.retain_height instead of retain-blocks config option * remove State.RetainHeight, return value instead * fix minor issues * rename pruneHeights() to pruneBlocks() * noop to fix GitHub borkage Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
5 years ago
add support for block pruning via ABCI Commit response (#4588) * Added BlockStore.DeleteBlock() * Added initial block pruner prototype * wip * Added BlockStore.PruneBlocks() * Added consensus setting for block pruning * Added BlockStore base * Error on replay if base does not have blocks * Handle missing blocks when sending VoteSetMaj23Message * Error message tweak * Properly update blockstore state * Error message fix again * blockchain: ignore peer missing blocks * Added FIXME * Added test for block replay with truncated history * Handle peer base in blockchain reactor * Improved replay error handling * Added tests for Store.PruneBlocks() * Fix non-RPC handling of truncated block history * Panic on missing block meta in needProofBlock() * Updated changelog * Handle truncated block history in RPC layer * Added info about earliest block in /status RPC * Reorder height and base in blockchain reactor messages * Updated changelog * Fix tests * Appease linter * Minor review fixes * Non-empty BlockStores should always have base > 0 * Update code to assume base > 0 invariant * Added blockstore tests for pruning to 0 * Make sure we don't prune below the current base * Added BlockStore.Size() * config: added retain_blocks recommendations * Update v1 blockchain reactor to handle blockstore base * Added state database pruning * Propagate errors on missing validator sets * Comment tweaks * Improved error message Co-Authored-By: Anton Kaliaev <anton.kalyaev@gmail.com> * use ABCI field ResponseCommit.retain_height instead of retain-blocks config option * remove State.RetainHeight, return value instead * fix minor issues * rename pruneHeights() to pruneBlocks() * noop to fix GitHub borkage Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
5 years ago
7 years ago
8 years ago
7 years ago
8 years ago
8 years ago
8 years ago
cs/replay: execCommitBlock should not read from state.lastValidators (#3067) * execCommitBlock should not read from state.lastValidators * fix height 1 * fix blockchain/reactor_test * fix consensus/mempool_test * fix consensus/reactor_test * fix consensus/replay_test * add CHANGELOG * fix consensus/reactor_test * fix consensus/replay_test * add a test for replay validators change * fix mem_pool test * fix byzantine test * remove a redundant code * reduce validator change blocks to 6 * fix * return peer0 config * seperate testName * seperate testName 1 * seperate testName 2 * seperate app db path * seperate app db path 1 * add a lock before startNet * move the lock to reactor_test * simulate just once * try to find problem * handshake only saveState when app version changed * update gometalinter to 3.0.0 (#3233) in the attempt to fix https://circleci.com/gh/tendermint/tendermint/43165 also code is simplified by running gofmt -s . remove unused vars enable linters we're currently passing remove deprecated linters (cherry picked from commit d47094550315c094512a242445e0dde24b5a03f5) * gofmt code * goimport code * change the bool name to testValidatorsChange * adjust receive kvstore.ProtocolVersion * adjust receive kvstore.ProtocolVersion 1 * adjust receive kvstore.ProtocolVersion 3 * fix merge execution.go * fix merge develop * fix merge develop 1 * fix run cleanupFunc * adjust code according to reviewers' opinion * modify the func name match the convention * simplify simulate a chain containing some validator change txs 1 * test CI error * Merge remote-tracking branch 'upstream/develop' into fixReplay 1 * fix pubsub_test * subscribeUnbuffered vote channel
6 years ago
add support for block pruning via ABCI Commit response (#4588) * Added BlockStore.DeleteBlock() * Added initial block pruner prototype * wip * Added BlockStore.PruneBlocks() * Added consensus setting for block pruning * Added BlockStore base * Error on replay if base does not have blocks * Handle missing blocks when sending VoteSetMaj23Message * Error message tweak * Properly update blockstore state * Error message fix again * blockchain: ignore peer missing blocks * Added FIXME * Added test for block replay with truncated history * Handle peer base in blockchain reactor * Improved replay error handling * Added tests for Store.PruneBlocks() * Fix non-RPC handling of truncated block history * Panic on missing block meta in needProofBlock() * Updated changelog * Handle truncated block history in RPC layer * Added info about earliest block in /status RPC * Reorder height and base in blockchain reactor messages * Updated changelog * Fix tests * Appease linter * Minor review fixes * Non-empty BlockStores should always have base > 0 * Update code to assume base > 0 invariant * Added blockstore tests for pruning to 0 * Make sure we don't prune below the current base * Added BlockStore.Size() * config: added retain_blocks recommendations * Update v1 blockchain reactor to handle blockstore base * Added state database pruning * Propagate errors on missing validator sets * Comment tweaks * Improved error message Co-Authored-By: Anton Kaliaev <anton.kalyaev@gmail.com> * use ABCI field ResponseCommit.retain_height instead of retain-blocks config option * remove State.RetainHeight, return value instead * fix minor issues * rename pruneHeights() to pruneBlocks() * noop to fix GitHub borkage Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
5 years ago
  1. package consensus
  2. import (
  3. "bytes"
  4. "fmt"
  5. "hash/crc32"
  6. "io"
  7. "reflect"
  8. "time"
  9. abci "github.com/tendermint/tendermint/abci/types"
  10. dbm "github.com/tendermint/tm-db"
  11. "github.com/tendermint/tendermint/libs/log"
  12. "github.com/tendermint/tendermint/proxy"
  13. sm "github.com/tendermint/tendermint/state"
  14. "github.com/tendermint/tendermint/types"
  15. )
  16. var crc32c = crc32.MakeTable(crc32.Castagnoli)
  17. // Functionality to replay blocks and messages on recovery from a crash.
  18. // There are two general failure scenarios:
  19. //
  20. // 1. failure during consensus
  21. // 2. failure while applying the block
  22. //
  23. // The former is handled by the WAL, the latter by the proxyApp Handshake on
  24. // restart, which ultimately hands off the work to the WAL.
  25. //-----------------------------------------
  26. // 1. Recover from failure during consensus
  27. // (by replaying messages from the WAL)
  28. //-----------------------------------------
  29. // Unmarshal and apply a single message to the consensus state as if it were
  30. // received in receiveRoutine. Lines that start with "#" are ignored.
  31. // NOTE: receiveRoutine should not be running.
  32. func (cs *State) readReplayMessage(msg *TimedWALMessage, newStepSub types.Subscription) error {
  33. // Skip meta messages which exist for demarcating boundaries.
  34. if _, ok := msg.Msg.(EndHeightMessage); ok {
  35. return nil
  36. }
  37. // for logging
  38. switch m := msg.Msg.(type) {
  39. case types.EventDataRoundState:
  40. cs.Logger.Info("Replay: New Step", "height", m.Height, "round", m.Round, "step", m.Step)
  41. // these are playback checks
  42. ticker := time.After(time.Second * 2)
  43. if newStepSub != nil {
  44. select {
  45. case stepMsg := <-newStepSub.Out():
  46. m2 := stepMsg.Data().(types.EventDataRoundState)
  47. if m.Height != m2.Height || m.Round != m2.Round || m.Step != m2.Step {
  48. return fmt.Errorf("roundState mismatch. Got %v; Expected %v", m2, m)
  49. }
  50. case <-newStepSub.Cancelled():
  51. return fmt.Errorf("failed to read off newStepSub.Out(). newStepSub was cancelled")
  52. case <-ticker:
  53. return fmt.Errorf("failed to read off newStepSub.Out()")
  54. }
  55. }
  56. case msgInfo:
  57. peerID := m.PeerID
  58. if peerID == "" {
  59. peerID = "local"
  60. }
  61. switch msg := m.Msg.(type) {
  62. case *ProposalMessage:
  63. p := msg.Proposal
  64. cs.Logger.Info("Replay: Proposal", "height", p.Height, "round", p.Round, "header",
  65. p.BlockID.PartSetHeader, "pol", p.POLRound, "peer", peerID)
  66. case *BlockPartMessage:
  67. cs.Logger.Info("Replay: BlockPart", "height", msg.Height, "round", msg.Round, "peer", peerID)
  68. case *VoteMessage:
  69. v := msg.Vote
  70. cs.Logger.Info("Replay: Vote", "height", v.Height, "round", v.Round, "type", v.Type,
  71. "blockID", v.BlockID, "peer", peerID)
  72. }
  73. cs.handleMsg(m)
  74. case timeoutInfo:
  75. cs.Logger.Info("Replay: Timeout", "height", m.Height, "round", m.Round, "step", m.Step, "dur", m.Duration)
  76. cs.handleTimeout(m, cs.RoundState)
  77. default:
  78. return fmt.Errorf("replay: Unknown TimedWALMessage type: %v", reflect.TypeOf(msg.Msg))
  79. }
  80. return nil
  81. }
  82. // Replay only those messages since the last block. `timeoutRoutine` should
  83. // run concurrently to read off tickChan.
  84. func (cs *State) catchupReplay(csHeight int64) error {
  85. // Set replayMode to true so we don't log signing errors.
  86. cs.replayMode = true
  87. defer func() { cs.replayMode = false }()
  88. // Ensure that #ENDHEIGHT for this height doesn't exist.
  89. // NOTE: This is just a sanity check. As far as we know things work fine
  90. // without it, and Handshake could reuse State if it weren't for
  91. // this check (since we can crash after writing #ENDHEIGHT).
  92. //
  93. // Ignore data corruption errors since this is a sanity check.
  94. gr, found, err := cs.wal.SearchForEndHeight(csHeight, &WALSearchOptions{IgnoreDataCorruptionErrors: true})
  95. if err != nil {
  96. return err
  97. }
  98. if gr != nil {
  99. if err := gr.Close(); err != nil {
  100. return err
  101. }
  102. }
  103. if found {
  104. return fmt.Errorf("wal should not contain #ENDHEIGHT %d", csHeight)
  105. }
  106. // Search for last height marker.
  107. //
  108. // Ignore data corruption errors in previous heights because we only care about last height
  109. gr, found, err = cs.wal.SearchForEndHeight(csHeight-1, &WALSearchOptions{IgnoreDataCorruptionErrors: true})
  110. if err == io.EOF {
  111. cs.Logger.Error("Replay: wal.group.Search returned EOF", "#ENDHEIGHT", csHeight-1)
  112. } else if err != nil {
  113. return err
  114. }
  115. if !found {
  116. return fmt.Errorf("cannot replay height %d. WAL does not contain #ENDHEIGHT for %d", csHeight, csHeight-1)
  117. }
  118. defer gr.Close()
  119. cs.Logger.Info("Catchup by replaying consensus messages", "height", csHeight)
  120. var msg *TimedWALMessage
  121. dec := WALDecoder{gr}
  122. LOOP:
  123. for {
  124. msg, err = dec.Decode()
  125. switch {
  126. case err == io.EOF:
  127. break LOOP
  128. case IsDataCorruptionError(err):
  129. cs.Logger.Error("data has been corrupted in last height of consensus WAL", "err", err, "height", csHeight)
  130. return err
  131. case err != nil:
  132. return err
  133. }
  134. // NOTE: since the priv key is set when the msgs are received
  135. // it will attempt to eg double sign but we can just ignore it
  136. // since the votes will be replayed and we'll get to the next step
  137. if err := cs.readReplayMessage(msg, nil); err != nil {
  138. return err
  139. }
  140. }
  141. cs.Logger.Info("Replay: Done")
  142. return nil
  143. }
  144. //--------------------------------------------------------------------------------
  145. // Parses marker lines of the form:
  146. // #ENDHEIGHT: 12345
  147. /*
  148. func makeHeightSearchFunc(height int64) auto.SearchFunc {
  149. return func(line string) (int, error) {
  150. line = strings.TrimRight(line, "\n")
  151. parts := strings.Split(line, " ")
  152. if len(parts) != 2 {
  153. return -1, errors.New("line did not have 2 parts")
  154. }
  155. i, err := strconv.Atoi(parts[1])
  156. if err != nil {
  157. return -1, errors.New("failed to parse INFO: " + err.Error())
  158. }
  159. if height < i {
  160. return 1, nil
  161. } else if height == i {
  162. return 0, nil
  163. } else {
  164. return -1, nil
  165. }
  166. }
  167. }*/
  168. //---------------------------------------------------
  169. // 2. Recover from failure while applying the block.
  170. // (by handshaking with the app to figure out where
  171. // we were last, and using the WAL to recover there.)
  172. //---------------------------------------------------
  173. type Handshaker struct {
  174. stateDB dbm.DB
  175. initialState sm.State
  176. store sm.BlockStore
  177. eventBus types.BlockEventPublisher
  178. genDoc *types.GenesisDoc
  179. logger log.Logger
  180. nBlocks int // number of blocks applied to the state
  181. }
  182. func NewHandshaker(stateDB dbm.DB, state sm.State,
  183. store sm.BlockStore, genDoc *types.GenesisDoc) *Handshaker {
  184. return &Handshaker{
  185. stateDB: stateDB,
  186. initialState: state,
  187. store: store,
  188. eventBus: types.NopEventBus{},
  189. genDoc: genDoc,
  190. logger: log.NewNopLogger(),
  191. nBlocks: 0,
  192. }
  193. }
  194. func (h *Handshaker) SetLogger(l log.Logger) {
  195. h.logger = l
  196. }
  197. // SetEventBus - sets the event bus for publishing block related events.
  198. // If not called, it defaults to types.NopEventBus.
  199. func (h *Handshaker) SetEventBus(eventBus types.BlockEventPublisher) {
  200. h.eventBus = eventBus
  201. }
  202. // NBlocks returns the number of blocks applied to the state.
  203. func (h *Handshaker) NBlocks() int {
  204. return h.nBlocks
  205. }
  206. // TODO: retry the handshake/replay if it fails ?
  207. func (h *Handshaker) Handshake(proxyApp proxy.AppConns) error {
  208. // Handshake is done via ABCI Info on the query conn.
  209. res, err := proxyApp.Query().InfoSync(proxy.RequestInfo)
  210. if err != nil {
  211. return fmt.Errorf("error calling Info: %v", err)
  212. }
  213. blockHeight := res.LastBlockHeight
  214. if blockHeight < 0 {
  215. return fmt.Errorf("got a negative last block height (%d) from the app", blockHeight)
  216. }
  217. appHash := res.LastBlockAppHash
  218. h.logger.Info("ABCI Handshake App Info",
  219. "height", blockHeight,
  220. "hash", fmt.Sprintf("%X", appHash),
  221. "software-version", res.Version,
  222. "protocol-version", res.AppVersion,
  223. )
  224. // Only set the version if we're starting from zero.
  225. if h.initialState.LastBlockHeight == 0 {
  226. h.initialState.Version.Consensus.App = res.AppVersion
  227. }
  228. // Replay blocks up to the latest in the blockstore.
  229. _, err = h.ReplayBlocks(h.initialState, appHash, blockHeight, proxyApp)
  230. if err != nil {
  231. return fmt.Errorf("error on replay: %v", err)
  232. }
  233. h.logger.Info("Completed ABCI Handshake - Tendermint and App are synced",
  234. "appHeight", blockHeight, "appHash", fmt.Sprintf("%X", appHash))
  235. // TODO: (on restart) replay mempool
  236. return nil
  237. }
  238. // ReplayBlocks replays all blocks since appBlockHeight and ensures the result
  239. // matches the current state.
  240. // Returns the final AppHash or an error.
  241. func (h *Handshaker) ReplayBlocks(
  242. state sm.State,
  243. appHash []byte,
  244. appBlockHeight int64,
  245. proxyApp proxy.AppConns,
  246. ) ([]byte, error) {
  247. storeBlockBase := h.store.Base()
  248. storeBlockHeight := h.store.Height()
  249. stateBlockHeight := state.LastBlockHeight
  250. h.logger.Info(
  251. "ABCI Replay Blocks",
  252. "appHeight",
  253. appBlockHeight,
  254. "storeHeight",
  255. storeBlockHeight,
  256. "stateHeight",
  257. stateBlockHeight)
  258. // If appBlockHeight == 0 it means that we are at genesis and hence should send InitChain.
  259. if appBlockHeight == 0 {
  260. validators := make([]*types.Validator, len(h.genDoc.Validators))
  261. for i, val := range h.genDoc.Validators {
  262. validators[i] = types.NewValidator(val.PubKey, val.Power)
  263. }
  264. validatorSet := types.NewValidatorSet(validators)
  265. nextVals := types.TM2PB.ValidatorUpdates(validatorSet)
  266. csParams := types.TM2PB.ConsensusParams(h.genDoc.ConsensusParams)
  267. req := abci.RequestInitChain{
  268. Time: h.genDoc.GenesisTime,
  269. ChainId: h.genDoc.ChainID,
  270. ConsensusParams: csParams,
  271. Validators: nextVals,
  272. AppStateBytes: h.genDoc.AppState,
  273. }
  274. res, err := proxyApp.Consensus().InitChainSync(req)
  275. if err != nil {
  276. return nil, err
  277. }
  278. if stateBlockHeight == 0 { //we only update state when we are in initial state
  279. // If the app returned validators or consensus params, update the state.
  280. if len(res.Validators) > 0 {
  281. vals, err := types.PB2TM.ValidatorUpdates(res.Validators)
  282. if err != nil {
  283. return nil, err
  284. }
  285. state.Validators = types.NewValidatorSet(vals)
  286. state.NextValidators = types.NewValidatorSet(vals)
  287. } else if len(h.genDoc.Validators) == 0 {
  288. // If validator set is not set in genesis and still empty after InitChain, exit.
  289. return nil, fmt.Errorf("validator set is nil in genesis and still empty after InitChain")
  290. }
  291. if res.ConsensusParams != nil {
  292. state.ConsensusParams = types.UpdateConsensusParams(state.ConsensusParams, res.ConsensusParams)
  293. state.Version.Consensus.App = state.ConsensusParams.Version.AppVersion
  294. }
  295. sm.SaveState(h.stateDB, state)
  296. }
  297. }
  298. // First handle edge cases and constraints on the storeBlockHeight and storeBlockBase.
  299. switch {
  300. case storeBlockHeight == 0:
  301. assertAppHashEqualsOneFromState(appHash, state)
  302. return appHash, nil
  303. case appBlockHeight < storeBlockBase-1:
  304. // the app is too far behind truncated store (can be 1 behind since we replay the next)
  305. return appHash, sm.ErrAppBlockHeightTooLow{AppHeight: appBlockHeight, StoreBase: storeBlockBase}
  306. case storeBlockHeight < appBlockHeight:
  307. // the app should never be ahead of the store (but this is under app's control)
  308. return appHash, sm.ErrAppBlockHeightTooHigh{CoreHeight: storeBlockHeight, AppHeight: appBlockHeight}
  309. case storeBlockHeight < stateBlockHeight:
  310. // the state should never be ahead of the store (this is under tendermint's control)
  311. panic(fmt.Sprintf("StateBlockHeight (%d) > StoreBlockHeight (%d)", stateBlockHeight, storeBlockHeight))
  312. case storeBlockHeight > stateBlockHeight+1:
  313. // store should be at most one ahead of the state (this is under tendermint's control)
  314. panic(fmt.Sprintf("StoreBlockHeight (%d) > StateBlockHeight + 1 (%d)", storeBlockHeight, stateBlockHeight+1))
  315. }
  316. var err error
  317. // Now either store is equal to state, or one ahead.
  318. // For each, consider all cases of where the app could be, given app <= store
  319. if storeBlockHeight == stateBlockHeight {
  320. // Tendermint ran Commit and saved the state.
  321. // Either the app is asking for replay, or we're all synced up.
  322. if appBlockHeight < storeBlockHeight {
  323. // the app is behind, so replay blocks, but no need to go through WAL (state is already synced to store)
  324. return h.replayBlocks(state, proxyApp, appBlockHeight, storeBlockHeight, false)
  325. } else if appBlockHeight == storeBlockHeight {
  326. // We're good!
  327. assertAppHashEqualsOneFromState(appHash, state)
  328. return appHash, nil
  329. }
  330. } else if storeBlockHeight == stateBlockHeight+1 {
  331. // We saved the block in the store but haven't updated the state,
  332. // so we'll need to replay a block using the WAL.
  333. switch {
  334. case appBlockHeight < stateBlockHeight:
  335. // the app is further behind than it should be, so replay blocks
  336. // but leave the last block to go through the WAL
  337. return h.replayBlocks(state, proxyApp, appBlockHeight, storeBlockHeight, true)
  338. case appBlockHeight == stateBlockHeight:
  339. // We haven't run Commit (both the state and app are one block behind),
  340. // so replayBlock with the real app.
  341. // NOTE: We could instead use the cs.WAL on cs.Start,
  342. // but we'd have to allow the WAL to replay a block that wrote it's #ENDHEIGHT
  343. h.logger.Info("Replay last block using real app")
  344. state, err = h.replayBlock(state, storeBlockHeight, proxyApp.Consensus())
  345. return state.AppHash, err
  346. case appBlockHeight == storeBlockHeight:
  347. // We ran Commit, but didn't save the state, so replayBlock with mock app.
  348. abciResponses, err := sm.LoadABCIResponses(h.stateDB, storeBlockHeight)
  349. if err != nil {
  350. return nil, err
  351. }
  352. mockApp := newMockProxyApp(appHash, abciResponses)
  353. h.logger.Info("Replay last block using mock app")
  354. state, err = h.replayBlock(state, storeBlockHeight, mockApp)
  355. return state.AppHash, err
  356. }
  357. }
  358. panic(fmt.Sprintf("uncovered case! appHeight: %d, storeHeight: %d, stateHeight: %d",
  359. appBlockHeight, storeBlockHeight, stateBlockHeight))
  360. }
  361. func (h *Handshaker) replayBlocks(
  362. state sm.State,
  363. proxyApp proxy.AppConns,
  364. appBlockHeight,
  365. storeBlockHeight int64,
  366. mutateState bool) ([]byte, error) {
  367. // App is further behind than it should be, so we need to replay blocks.
  368. // We replay all blocks from appBlockHeight+1.
  369. //
  370. // Note that we don't have an old version of the state,
  371. // so we by-pass state validation/mutation using sm.ExecCommitBlock.
  372. // This also means we won't be saving validator sets if they change during this period.
  373. // TODO: Load the historical information to fix this and just use state.ApplyBlock
  374. //
  375. // If mutateState == true, the final block is replayed with h.replayBlock()
  376. var appHash []byte
  377. var err error
  378. finalBlock := storeBlockHeight
  379. if mutateState {
  380. finalBlock--
  381. }
  382. for i := appBlockHeight + 1; i <= finalBlock; i++ {
  383. h.logger.Info("Applying block", "height", i)
  384. block := h.store.LoadBlock(i)
  385. // Extra check to ensure the app was not changed in a way it shouldn't have.
  386. if len(appHash) > 0 {
  387. assertAppHashEqualsOneFromBlock(appHash, block)
  388. }
  389. appHash, err = sm.ExecCommitBlock(proxyApp.Consensus(), block, h.logger, h.stateDB)
  390. if err != nil {
  391. return nil, err
  392. }
  393. h.nBlocks++
  394. }
  395. if mutateState {
  396. // sync the final block
  397. state, err = h.replayBlock(state, storeBlockHeight, proxyApp.Consensus())
  398. if err != nil {
  399. return nil, err
  400. }
  401. appHash = state.AppHash
  402. }
  403. assertAppHashEqualsOneFromState(appHash, state)
  404. return appHash, nil
  405. }
  406. // ApplyBlock on the proxyApp with the last block.
  407. func (h *Handshaker) replayBlock(state sm.State, height int64, proxyApp proxy.AppConnConsensus) (sm.State, error) {
  408. block := h.store.LoadBlock(height)
  409. meta := h.store.LoadBlockMeta(height)
  410. // Use stubs for both mempool and evidence pool since no transactions nor
  411. // evidence are needed here - block already exists.
  412. blockExec := sm.NewBlockExecutor(h.stateDB, h.logger, proxyApp, emptyMempool{}, emptyEvidencePool{})
  413. blockExec.SetEventBus(h.eventBus)
  414. var err error
  415. state, _, err = blockExec.ApplyBlock(state, meta.BlockID, block)
  416. if err != nil {
  417. return sm.State{}, err
  418. }
  419. h.nBlocks++
  420. return state, nil
  421. }
  422. func assertAppHashEqualsOneFromBlock(appHash []byte, block *types.Block) {
  423. if !bytes.Equal(appHash, block.AppHash) {
  424. panic(fmt.Sprintf(`block.AppHash does not match AppHash after replay. Got %X, expected %X.
  425. Block: %v
  426. `,
  427. appHash, block.AppHash, block))
  428. }
  429. }
  430. func assertAppHashEqualsOneFromState(appHash []byte, state sm.State) {
  431. if !bytes.Equal(appHash, state.AppHash) {
  432. panic(fmt.Sprintf(`state.AppHash does not match AppHash after replay. Got
  433. %X, expected %X.
  434. State: %v
  435. Did you reset Tendermint without resetting your application's data?`,
  436. appHash, state.AppHash, state))
  437. }
  438. }