diff options
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 75 | ||||
| -rw-r--r-- | eth/handler.go | 6 |
2 files changed, 54 insertions, 27 deletions
diff --git a/eth/backend.go b/eth/backend.go index 646a4eaf2..7c1d7d617 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -5,6 +5,7 @@ import ( "fmt" "path" "strings" + "time" "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/accounts" @@ -29,8 +30,9 @@ var ( jsonlogger = logger.NewJsonLogger() defaultBootNodes = []*discover.Node{ - // ETH/DEV cmd/bootnode - discover.MustParseNode("enode://09fbeec0d047e9a37e63f60f8618aa9df0e49271f3fadb2c070dc09e2099b95827b63a8b837c6fd01d0802d457dd83e3bd48bd3e6509f8209ed90dabbc30e3d3@52.16.188.185:30303"), + // ETH/DEV Go Bootnodes + discover.MustParseNode("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303"), + discover.MustParseNode("enode://7f25d3eab333a6b98a8b5ed68d962bb22c876ffcd5561fca54e3c2ef27f754df6f7fd7c9b74cc919067abac154fb8e1f8385505954f161ae440abc355855e034@54.207.93.166:30303"), // ETH/DEV cpp-ethereum (poc-9.ethdev.com) discover.MustParseNode("enode://487611428e6c99a11a9795a6abe7b529e81315ca6aad66e2a2fc76e3adf263faba0d35466c2f8f68d561dbefa8878d4df5f1f2ddb1fbeab7f42ffb8cd328bd4a@5.1.83.226:30303"), } @@ -123,6 +125,8 @@ type Ethereum struct { blockDb common.Database // Block chain database stateDb common.Database // State changes database extraDb common.Database // Extra database (txs, etc) + // Closed when databases are flushed and closed + databasesClosed chan bool //*** SERVICES *** // State manager for processing new blocks and managing the over all states @@ -197,18 +201,19 @@ func New(config *Config) (*Ethereum, error) { glog.V(logger.Info).Infof("Blockchain DB Version: %d", config.BlockChainVersion) eth := &Ethereum{ - shutdownChan: make(chan bool), - blockDb: blockDb, - stateDb: stateDb, - extraDb: extraDb, - eventMux: &event.TypeMux{}, - accountManager: config.AccountManager, - DataDir: config.DataDir, - etherbase: common.HexToAddress(config.Etherbase), - clientVersion: config.Name, // TODO should separate from Name - ethVersionId: config.ProtocolVersion, - netVersionId: config.NetworkId, - NatSpec: config.NatSpec, + shutdownChan: make(chan bool), + databasesClosed: make(chan bool), + blockDb: blockDb, + stateDb: stateDb, + extraDb: extraDb, + eventMux: &event.TypeMux{}, + accountManager: config.AccountManager, + DataDir: config.DataDir, + etherbase: common.HexToAddress(config.Etherbase), + clientVersion: config.Name, // TODO should separate from Name + ethVersionId: config.ProtocolVersion, + netVersionId: config.NetworkId, + NatSpec: config.NatSpec, } eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux()) @@ -317,10 +322,9 @@ func (s *Ethereum) StartMining() error { err = fmt.Errorf("Cannot start mining without etherbase address: %v", err) glog.V(logger.Error).Infoln(err) return err - } - s.miner.Start(eb) + go s.miner.Start(eb) return nil } @@ -376,6 +380,9 @@ func (s *Ethereum) Start() error { } } + // periodically flush databases + go s.syncDatabases() + // Start services go s.txPool.Start() s.protocolManager.Start() @@ -392,6 +399,34 @@ func (s *Ethereum) Start() error { return nil } +func (s *Ethereum) syncDatabases() { + ticker := time.NewTicker(1 * time.Minute) +done: + for { + select { + case <-ticker.C: + // don't change the order of database flushes + if err := s.extraDb.Flush(); err != nil { + glog.V(logger.Error).Infof("error: flush extraDb: %v\n", err) + } + if err := s.stateDb.Flush(); err != nil { + glog.V(logger.Error).Infof("error: flush stateDb: %v\n", err) + } + if err := s.blockDb.Flush(); err != nil { + glog.V(logger.Error).Infof("error: flush blockDb: %v\n", err) + } + case <-s.shutdownChan: + break done + } + } + + s.blockDb.Close() + s.stateDb.Close() + s.extraDb.Close() + + close(s.databasesClosed) +} + func (s *Ethereum) StartForTest() { jsonlogger.LogJson(&logger.LogStarting{ ClientString: s.net.Name, @@ -412,12 +447,7 @@ func (self *Ethereum) SuggestPeer(nodeURL string) error { } func (s *Ethereum) Stop() { - // Close the database - defer s.blockDb.Close() - defer s.stateDb.Close() - defer s.extraDb.Close() - - s.txSub.Unsubscribe() // quits txBroadcastLoop + s.txSub.Unsubscribe() // quits txBroadcastLoop s.protocolManager.Stop() s.txPool.Stop() @@ -432,6 +462,7 @@ func (s *Ethereum) Stop() { // This function will wait for a shutdown and resumes main thread execution func (s *Ethereum) WaitForShutdown() { + <-s.databasesClosed <-s.shutdownChan } diff --git a/eth/handler.go b/eth/handler.go index d466dbfee..a634b5bfd 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -276,7 +276,7 @@ func (self *ProtocolManager) handleMsg(p *peer) error { return errResp(ErrDecode, "block validation %v: %v", msg, err) } hash := request.Block.Hash() - // Add the block hash as a known hash to the peer. This will later be used to detirmine + // Add the block hash as a known hash to the peer. This will later be used to determine // who should receive this. p.blockHashes.Add(hash) @@ -296,7 +296,6 @@ func (self *ProtocolManager) handleMsg(p *peer) error { if self.chainman.HasBlock(hash) { break } - /* XXX unsure about this */ if self.chainman.Td().Cmp(request.TD) > 0 && new(big.Int).Add(request.Block.Number(), big.NewInt(7)).Cmp(self.chainman.CurrentBlock().Number()) < 0 { glog.V(logger.Debug).Infof("[%s] dropped block %v due to low TD %v\n", p.id, request.Block.Number(), request.TD) break @@ -305,14 +304,12 @@ func (self *ProtocolManager) handleMsg(p *peer) error { // Attempt to insert the newly received by checking if the parent exists. // if the parent exists we process the block and propagate to our peers // if the parent does not exists we delegate to the downloader. - // NOTE we can reduce chatter by dropping blocks with Td < currentTd if self.chainman.HasBlock(request.Block.ParentHash()) { if err := self.chainman.InsertChain(types.Blocks{request.Block}); err != nil { // handle error return nil } self.BroadcastBlock(hash, request.Block) - //fmt.Println(request.Block.Hash().Hex(), "our calculated TD =", request.Block.Td, "their TD =", request.TD) } else { // adding blocks is synchronous go func() { @@ -322,7 +319,6 @@ func (self *ProtocolManager) handleMsg(p *peer) error { return } self.BroadcastBlock(hash, request.Block) - //fmt.Println(request.Block.Hash().Hex(), "our calculated TD =", request.Block.Td, "their TD =", request.TD) }() } default: |