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.

207 lines
6.7 KiB

mempool: move interface into mempool package (#3524) ## Description Refs #2659 Breaking changes in the mempool package: [mempool] #2659 Mempool now an interface old Mempool renamed to CListMempool NewMempool renamed to NewCListMempool Option renamed to CListOption MempoolReactor renamed to Reactor NewMempoolReactor renamed to NewReactor unexpose TxID method TxInfo.PeerID renamed to SenderID unexpose MempoolReactor.Mempool Breaking changes in the state package: [state] #2659 Mempool interface moved to mempool package MockMempool moved to top-level mock package and renamed to Mempool Non Breaking changes in the node package: [node] #2659 Add Mempool method, which allows you to access mempool ## Commits * move Mempool interface into mempool package Refs #2659 Breaking changes in the mempool package: - Mempool now an interface - old Mempool renamed to CListMempool Breaking changes to state package: - MockMempool moved to mempool/mock package and renamed to Mempool - Mempool interface moved to mempool package * assert CListMempool impl Mempool * gofmt code * rename MempoolReactor to Reactor - combine everything into one interface - rename TxInfo.PeerID to TxInfo.SenderID - unexpose MempoolReactor.Mempool * move mempool mock into top-level mock package * add a fixme TxsFront should not be a part of the Mempool interface because it leaks implementation details. Instead, we need to come up with general interface for querying the mempool so the MempoolReactor can fetch and broadcast txs to peers. * change node#Mempool to return interface * save commit = new reactor arch * Revert "save commit = new reactor arch" This reverts commit 1bfceacd9d65a720574683a7f22771e69af9af4d. * require CListMempool in mempool.Reactor * add two changelog entries * fixes after my own review * quote interfaces, structs and functions * fixes after Ismail's review * make node's mempool an interface * make InitWAL/CloseWAL methods a part of Mempool interface * fix merge conflicts * make node's mempool an interface
6 years ago
mempool: move interface into mempool package (#3524) ## Description Refs #2659 Breaking changes in the mempool package: [mempool] #2659 Mempool now an interface old Mempool renamed to CListMempool NewMempool renamed to NewCListMempool Option renamed to CListOption MempoolReactor renamed to Reactor NewMempoolReactor renamed to NewReactor unexpose TxID method TxInfo.PeerID renamed to SenderID unexpose MempoolReactor.Mempool Breaking changes in the state package: [state] #2659 Mempool interface moved to mempool package MockMempool moved to top-level mock package and renamed to Mempool Non Breaking changes in the node package: [node] #2659 Add Mempool method, which allows you to access mempool ## Commits * move Mempool interface into mempool package Refs #2659 Breaking changes in the mempool package: - Mempool now an interface - old Mempool renamed to CListMempool Breaking changes to state package: - MockMempool moved to mempool/mock package and renamed to Mempool - Mempool interface moved to mempool package * assert CListMempool impl Mempool * gofmt code * rename MempoolReactor to Reactor - combine everything into one interface - rename TxInfo.PeerID to TxInfo.SenderID - unexpose MempoolReactor.Mempool * move mempool mock into top-level mock package * add a fixme TxsFront should not be a part of the Mempool interface because it leaks implementation details. Instead, we need to come up with general interface for querying the mempool so the MempoolReactor can fetch and broadcast txs to peers. * change node#Mempool to return interface * save commit = new reactor arch * Revert "save commit = new reactor arch" This reverts commit 1bfceacd9d65a720574683a7f22771e69af9af4d. * require CListMempool in mempool.Reactor * add two changelog entries * fixes after my own review * quote interfaces, structs and functions * fixes after Ismail's review * make node's mempool an interface * make InitWAL/CloseWAL methods a part of Mempool interface * fix merge conflicts * make node's mempool an interface
6 years ago
cs: sync WAL more frequently (#3300) As per #3043, this adds a ticker to sync the WAL every 2s while the WAL is running. * Flush WAL every 2s This adds a ticker that flushes the WAL every 2s while the WAL is running. This is related to #3043. * Fix spelling * Increase timeout to 2mins for slower build environments * Make WAL sync interval configurable * Add TODO to replace testChan with more comprehensive testBus * Remove extraneous debug statement * Remove testChan in favour of using system time As per https://github.com/tendermint/tendermint/pull/3300#discussion_r255886586, this removes the `testChan` WAL member and replaces the approach with a system time-oriented one. In this new approach, we keep track of the system time at which each flush and periodic flush successfully occurred. The naming of the various functions is also updated here to be more consistent with "flushing" as opposed to "sync'ing". * Update naming convention and ensure lock for timestamp update * Add Flush method as part of WAL interface Adds a `Flush` method as part of the WAL interface to enforce the idea that we can manually trigger a WAL flush from outside of the WAL. This is employed in the consensus state management to flush the WAL prior to signing votes/proposals, as per https://github.com/tendermint/tendermint/issues/3043#issuecomment-453853630 * Update CHANGELOG_PENDING * Remove mutex approach and replace with DI The dependency injection approach to dealing with testing concerns could allow similar effects to some kind of "testing bus"-based approach. This commit introduces an example of this, where instead of relying on (potentially fragile) timing of things between the code and the test, we inject code into the function under test that can signal the test through a channel. This allows us to avoid the `time.Sleep()`-based approach previously employed. * Update comment on WAL flushing during vote signing Co-Authored-By: thanethomson <connect@thanethomson.com> * Simplify flush interval definition Co-Authored-By: thanethomson <connect@thanethomson.com> * Expand commentary on WAL disk flushing Co-Authored-By: thanethomson <connect@thanethomson.com> * Add broken test to illustrate WAL sync test problem Removes test-related state (dependency injection code) from the WAL data structure and adds test code to illustrate the problem with using `WALGenerateNBlocks` and `wal.SearchForEndHeight` to test periodic sync'ing. * Fix test error messages * Use WAL group buffer size to check for flush A function is added to `libs/autofile/group.go#Group` in order to return the size of the buffered data (i.e. data that has not yet been flushed to disk). The test now checks that, prior to a `time.Sleep`, the group buffer has data in it. After the `time.Sleep` (during which time the periodic flush should have been called), the buffer should be empty. * Remove config root dir removal from #3291 * Add godoc for NewWAL mentioning periodic sync
6 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
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
mempool: move interface into mempool package (#3524) ## Description Refs #2659 Breaking changes in the mempool package: [mempool] #2659 Mempool now an interface old Mempool renamed to CListMempool NewMempool renamed to NewCListMempool Option renamed to CListOption MempoolReactor renamed to Reactor NewMempoolReactor renamed to NewReactor unexpose TxID method TxInfo.PeerID renamed to SenderID unexpose MempoolReactor.Mempool Breaking changes in the state package: [state] #2659 Mempool interface moved to mempool package MockMempool moved to top-level mock package and renamed to Mempool Non Breaking changes in the node package: [node] #2659 Add Mempool method, which allows you to access mempool ## Commits * move Mempool interface into mempool package Refs #2659 Breaking changes in the mempool package: - Mempool now an interface - old Mempool renamed to CListMempool Breaking changes to state package: - MockMempool moved to mempool/mock package and renamed to Mempool - Mempool interface moved to mempool package * assert CListMempool impl Mempool * gofmt code * rename MempoolReactor to Reactor - combine everything into one interface - rename TxInfo.PeerID to TxInfo.SenderID - unexpose MempoolReactor.Mempool * move mempool mock into top-level mock package * add a fixme TxsFront should not be a part of the Mempool interface because it leaks implementation details. Instead, we need to come up with general interface for querying the mempool so the MempoolReactor can fetch and broadcast txs to peers. * change node#Mempool to return interface * save commit = new reactor arch * Revert "save commit = new reactor arch" This reverts commit 1bfceacd9d65a720574683a7f22771e69af9af4d. * require CListMempool in mempool.Reactor * add two changelog entries * fixes after my own review * quote interfaces, structs and functions * fixes after Ismail's review * make node's mempool an interface * make InitWAL/CloseWAL methods a part of Mempool interface * fix merge conflicts * make node's mempool an interface
6 years ago
  1. package consensus
  2. import (
  3. "bufio"
  4. "bytes"
  5. "fmt"
  6. "io"
  7. "path/filepath"
  8. "testing"
  9. "time"
  10. "github.com/pkg/errors"
  11. "github.com/tendermint/tendermint/abci/example/kvstore"
  12. bc "github.com/tendermint/tendermint/blockchain"
  13. cfg "github.com/tendermint/tendermint/config"
  14. cmn "github.com/tendermint/tendermint/libs/common"
  15. "github.com/tendermint/tendermint/libs/db"
  16. "github.com/tendermint/tendermint/libs/log"
  17. "github.com/tendermint/tendermint/mock"
  18. "github.com/tendermint/tendermint/privval"
  19. "github.com/tendermint/tendermint/proxy"
  20. sm "github.com/tendermint/tendermint/state"
  21. "github.com/tendermint/tendermint/types"
  22. )
  23. // WALGenerateNBlocks generates a consensus WAL. It does this by spinning up a
  24. // stripped down version of node (proxy app, event bus, consensus state) with a
  25. // persistent kvstore application and special consensus wal instance
  26. // (byteBufferWAL) and waits until numBlocks are created. If the node fails to produce given numBlocks, it returns an error.
  27. func WALGenerateNBlocks(t *testing.T, wr io.Writer, numBlocks int) (err error) {
  28. config := getConfig(t)
  29. app := kvstore.NewPersistentKVStoreApplication(filepath.Join(config.DBDir(), "wal_generator"))
  30. logger := log.TestingLogger().With("wal_generator", "wal_generator")
  31. logger.Info("generating WAL (last height msg excluded)", "numBlocks", numBlocks)
  32. /////////////////////////////////////////////////////////////////////////////
  33. // COPY PASTE FROM node.go WITH A FEW MODIFICATIONS
  34. // NOTE: we can't import node package because of circular dependency.
  35. // NOTE: we don't do handshake so need to set state.Version.Consensus.App directly.
  36. privValidatorKeyFile := config.PrivValidatorKeyFile()
  37. privValidatorStateFile := config.PrivValidatorStateFile()
  38. privValidator := privval.LoadOrGenFilePV(privValidatorKeyFile, privValidatorStateFile)
  39. genDoc, err := types.GenesisDocFromFile(config.GenesisFile())
  40. if err != nil {
  41. return errors.Wrap(err, "failed to read genesis file")
  42. }
  43. blockStoreDB := db.NewMemDB()
  44. stateDB := blockStoreDB
  45. state, err := sm.MakeGenesisState(genDoc)
  46. if err != nil {
  47. return errors.Wrap(err, "failed to make genesis state")
  48. }
  49. state.Version.Consensus.App = kvstore.ProtocolVersion
  50. sm.SaveState(stateDB, state)
  51. blockStore := bc.NewBlockStore(blockStoreDB)
  52. proxyApp := proxy.NewAppConns(proxy.NewLocalClientCreator(app))
  53. proxyApp.SetLogger(logger.With("module", "proxy"))
  54. if err := proxyApp.Start(); err != nil {
  55. return errors.Wrap(err, "failed to start proxy app connections")
  56. }
  57. defer proxyApp.Stop()
  58. eventBus := types.NewEventBus()
  59. eventBus.SetLogger(logger.With("module", "events"))
  60. if err := eventBus.Start(); err != nil {
  61. return errors.Wrap(err, "failed to start event bus")
  62. }
  63. defer eventBus.Stop()
  64. mempool := mock.Mempool{}
  65. evpool := sm.MockEvidencePool{}
  66. blockExec := sm.NewBlockExecutor(stateDB, log.TestingLogger(), proxyApp.Consensus(), mempool, evpool)
  67. consensusState := NewConsensusState(config.Consensus, state.Copy(), blockExec, blockStore, mempool, evpool)
  68. consensusState.SetLogger(logger)
  69. consensusState.SetEventBus(eventBus)
  70. if privValidator != nil {
  71. consensusState.SetPrivValidator(privValidator)
  72. }
  73. // END OF COPY PASTE
  74. /////////////////////////////////////////////////////////////////////////////
  75. // set consensus wal to buffered WAL, which will write all incoming msgs to buffer
  76. numBlocksWritten := make(chan struct{})
  77. wal := newByteBufferWAL(logger, NewWALEncoder(wr), int64(numBlocks), numBlocksWritten)
  78. // see wal.go#103
  79. wal.Write(EndHeightMessage{0})
  80. consensusState.wal = wal
  81. if err := consensusState.Start(); err != nil {
  82. return errors.Wrap(err, "failed to start consensus state")
  83. }
  84. select {
  85. case <-numBlocksWritten:
  86. consensusState.Stop()
  87. return nil
  88. case <-time.After(1 * time.Minute):
  89. consensusState.Stop()
  90. return fmt.Errorf("waited too long for tendermint to produce %d blocks (grep logs for `wal_generator`)", numBlocks)
  91. }
  92. }
  93. //WALWithNBlocks returns a WAL content with numBlocks.
  94. func WALWithNBlocks(t *testing.T, numBlocks int) (data []byte, err error) {
  95. var b bytes.Buffer
  96. wr := bufio.NewWriter(&b)
  97. if err := WALGenerateNBlocks(t, wr, numBlocks); err != nil {
  98. return []byte{}, err
  99. }
  100. wr.Flush()
  101. return b.Bytes(), nil
  102. }
  103. func randPort() int {
  104. // returns between base and base + spread
  105. base, spread := 20000, 20000
  106. return base + cmn.RandIntn(spread)
  107. }
  108. func makeAddrs() (string, string, string) {
  109. start := randPort()
  110. return fmt.Sprintf("tcp://0.0.0.0:%d", start),
  111. fmt.Sprintf("tcp://0.0.0.0:%d", start+1),
  112. fmt.Sprintf("tcp://0.0.0.0:%d", start+2)
  113. }
  114. // getConfig returns a config for test cases
  115. func getConfig(t *testing.T) *cfg.Config {
  116. c := cfg.ResetTestRoot(t.Name())
  117. // and we use random ports to run in parallel
  118. tm, rpc, grpc := makeAddrs()
  119. c.P2P.ListenAddress = tm
  120. c.RPC.ListenAddress = rpc
  121. c.RPC.GRPCListenAddress = grpc
  122. return c
  123. }
  124. // byteBufferWAL is a WAL which writes all msgs to a byte buffer. Writing stops
  125. // when the heightToStop is reached. Client will be notified via
  126. // signalWhenStopsTo channel.
  127. type byteBufferWAL struct {
  128. enc *WALEncoder
  129. stopped bool
  130. heightToStop int64
  131. signalWhenStopsTo chan<- struct{}
  132. logger log.Logger
  133. }
  134. // needed for determinism
  135. var fixedTime, _ = time.Parse(time.RFC3339, "2017-01-02T15:04:05Z")
  136. func newByteBufferWAL(logger log.Logger, enc *WALEncoder, nBlocks int64, signalStop chan<- struct{}) *byteBufferWAL {
  137. return &byteBufferWAL{
  138. enc: enc,
  139. heightToStop: nBlocks,
  140. signalWhenStopsTo: signalStop,
  141. logger: logger,
  142. }
  143. }
  144. // Save writes message to the internal buffer except when heightToStop is
  145. // reached, in which case it will signal the caller via signalWhenStopsTo and
  146. // skip writing.
  147. func (w *byteBufferWAL) Write(m WALMessage) error {
  148. if w.stopped {
  149. w.logger.Debug("WAL already stopped. Not writing message", "msg", m)
  150. return nil
  151. }
  152. if endMsg, ok := m.(EndHeightMessage); ok {
  153. w.logger.Debug("WAL write end height message", "height", endMsg.Height, "stopHeight", w.heightToStop)
  154. if endMsg.Height == w.heightToStop {
  155. w.logger.Debug("Stopping WAL at height", "height", endMsg.Height)
  156. w.signalWhenStopsTo <- struct{}{}
  157. w.stopped = true
  158. return nil
  159. }
  160. }
  161. w.logger.Debug("WAL Write Message", "msg", m)
  162. err := w.enc.Encode(&TimedWALMessage{fixedTime, m})
  163. if err != nil {
  164. panic(fmt.Sprintf("failed to encode the msg %v", m))
  165. }
  166. return nil
  167. }
  168. func (w *byteBufferWAL) WriteSync(m WALMessage) error {
  169. return w.Write(m)
  170. }
  171. func (w *byteBufferWAL) FlushAndSync() error { return nil }
  172. func (w *byteBufferWAL) SearchForEndHeight(height int64, options *WALSearchOptions) (rd io.ReadCloser, found bool, err error) {
  173. return nil, false, nil
  174. }
  175. func (w *byteBufferWAL) Start() error { return nil }
  176. func (w *byteBufferWAL) Stop() error { return nil }
  177. func (w *byteBufferWAL) Wait() {}