aboutsummaryrefslogtreecommitdiffstats
path: root/eth
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-09-14 15:45:40 +0800
committerFelix Lange <fjl@twurst.com>2015-09-15 05:36:30 +0800
commitb25258996059439df82687cc653ed14a5a9edce1 (patch)
treec8dd42cb534b8a629425e70733c6135b58acc2fe /eth
parentd581dfee5fbd46f3e6c54e3fab2717105e6bd510 (diff)
downloadgo-tangerine-b25258996059439df82687cc653ed14a5a9edce1.tar
go-tangerine-b25258996059439df82687cc653ed14a5a9edce1.tar.gz
go-tangerine-b25258996059439df82687cc653ed14a5a9edce1.tar.bz2
go-tangerine-b25258996059439df82687cc653ed14a5a9edce1.tar.lz
go-tangerine-b25258996059439df82687cc653ed14a5a9edce1.tar.xz
go-tangerine-b25258996059439df82687cc653ed14a5a9edce1.tar.zst
go-tangerine-b25258996059439df82687cc653ed14a5a9edce1.zip
ethdb: remove Flush
Diffstat (limited to 'eth')
-rw-r--r--eth/backend.go35
1 files changed, 2 insertions, 33 deletions
diff --git a/eth/backend.go b/eth/backend.go
index a923cfa78..349dfa613 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -213,9 +213,6 @@ type Ethereum struct {
chainDb ethdb.Database // Block chain database
dappDb ethdb.Database // Dapp database
- // Closed when databases are flushed and closed
- databasesClosed chan bool
-
//*** SERVICES ***
// State manager for processing new blocks and managing the over all states
blockProcessor *core.BlockProcessor
@@ -337,7 +334,6 @@ func New(config *Config) (*Ethereum, error) {
eth := &Ethereum{
shutdownChan: make(chan bool),
- databasesClosed: make(chan bool),
chainDb: chainDb,
dappDb: dappDb,
eventMux: &event.TypeMux{},
@@ -549,8 +545,6 @@ func (s *Ethereum) Start() error {
if err != nil {
return err
}
- // periodically flush databases
- go s.syncDatabases()
if s.AutoDAG {
s.StartAutoDAG()
@@ -566,32 +560,6 @@ func (s *Ethereum) Start() error {
return nil
}
-// sync databases every minute. If flushing fails we exit immediatly. The system
-// may not continue under any circumstances.
-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.dappDb.Flush(); err != nil {
- glog.Fatalf("fatal error: flush dappDb: %v (Restart your node. We are aware of this issue)\n", err)
- }
- if err := s.chainDb.Flush(); err != nil {
- glog.Fatalf("fatal error: flush chainDb: %v (Restart your node. We are aware of this issue)\n", err)
- }
- case <-s.shutdownChan:
- break done
- }
- }
-
- s.chainDb.Close()
- s.dappDb.Close()
-
- close(s.databasesClosed)
-}
-
func (s *Ethereum) StartForTest() {
jsonlogger.LogJson(&logger.LogStarting{
ClientString: s.net.Name,
@@ -622,12 +590,13 @@ func (s *Ethereum) Stop() {
}
s.StopAutoDAG()
+ s.chainDb.Close()
+ s.dappDb.Close()
close(s.shutdownChan)
}
// This function will wait for a shutdown and resumes main thread execution
func (s *Ethereum) WaitForShutdown() {
- <-s.databasesClosed
<-s.shutdownChan
}