forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 18:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/downloader: flush state data before exit

Browse source
This commit is contained in:
rjl493456442 2018-03-04 21:11:03 +08:00
parent d5c3458b37
commit f126d24bcf
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eth/downloader/statesync.go
View file

@ -274,16 +274,19 @@ func (s *stateSync) Cancel() error {
// receive data from peers, rather those are buffered up in the downloader and // receive data from peers, rather those are buffered up in the downloader and
// pushed here async. The reason is to decouple processing from data receipt // pushed here async. The reason is to decouple processing from data receipt
// and timeouts. // and timeouts.
func (s *stateSync) loop() error { func (s *stateSync) loop() (err error) {
// Listen for new peer events to assign tasks to them // Listen for new peer events to assign tasks to them
newPeer := make(chan *peerConnection, 1024) newPeer := make(chan *peerConnection, 1024)
peerSub := s.d.peers.SubscribeNewPeers(newPeer) peerSub := s.d.peers.SubscribeNewPeers(newPeer)
defer peerSub.Unsubscribe() defer peerSub.Unsubscribe()
defer func() {
err = s.commit(true)
}()
// Keep assigning new tasks until the sync completes or aborts // Keep assigning new tasks until the sync completes or aborts
for s.sched.Pending() > 0 { for s.sched.Pending() > 0 {
if err := s.commit(false); err != nil { if err = s.commit(false); err != nil {
return err return
} }
s.assignTasks() s.assignTasks()
// Tasks assigned, wait for something to happen // Tasks assigned, wait for something to happen
@ -307,14 +310,14 @@ func (s *stateSync) loop() error {
s.d.dropPeer(req.peer.id) s.d.dropPeer(req.peer.id)
} }
// Process all the received blobs and check for stale delivery // Process all the received blobs and check for stale delivery
if err := s.process(req); err != nil { if err = s.process(req); err != nil {
log.Warn("Node data write error", "err", err) log.Warn("Node data write error", "err", err)
return err return
} }
req.peer.SetNodeDataIdle(len(req.response)) req.peer.SetNodeDataIdle(len(req.response))
} }
} }
return s.commit(true) return
} }
func (s *stateSync) commit(force bool) error { func (s *stateSync) commit(force bool) error {
@ -323,7 +326,10 @@ func (s *stateSync) commit(force bool) error {
} }
start := time.Now() start := time.Now()
b := s.d.stateDB.NewBatch() b := s.d.stateDB.NewBatch()
s.sched.Commit(b) // Ignore empty write.
if written, _ := s.sched.Commit(b); written == 0 {
return nil
}
if err := b.Write(); err != nil { if err := b.Write(); err != nil {
return fmt.Errorf("DB write error: %v", err) return fmt.Errorf("DB write error: %v", err)
} }