1 files changed, 14 insertions, 6 deletions
diff --git a/eth/sync.go b/eth/sync.go
index 00b571782..aa7ebc77b 100644
--- a/eth/sync.go
+++ b/eth/sync.go
@@ -2,6 +2,7 @@ package eth
 
 import (
 	"math"
+	"sync/atomic"
 	"time"
 
 	"github.com/ethereum/go-ethereum/eth/downloader"
@@ -14,6 +15,7 @@ import (
 func (pm *ProtocolManager) update() {
 	forceSync := time.Tick(forceSyncCycle)
 	blockProc := time.Tick(blockProcCycle)
+	blockProcPend := int32(0)
 
 	for {
 		select {
@@ -36,7 +38,12 @@ func (pm *ProtocolManager) update() {
 			}
 		case <-blockProc:
 			// Try to pull some blocks from the downloaded
-			go pm.processBlocks()
+			if atomic.CompareAndSwapInt32(&blockProcPend, 0, 1) {
+				go func() {
+					pm.processBlocks()
+					atomic.StoreInt32(&blockProcPend, 0)
+				}()
+			}
 
 		case <-pm.quitSync:
 			return
@@ -52,7 +59,7 @@ func (pm *ProtocolManager) processBlocks() error {
 	pm.wg.Add(1)
 	defer pm.wg.Done()
 
-	// Take a batch of blocks (will return nil if a previous batch has not reached the chain yet)
+	// Short circuit if no blocks are available for insertion
 	blocks := pm.downloader.TakeBlocks()
 	if len(blocks) == 0 {
 		return nil
@@ -63,9 +70,8 @@ func (pm *ProtocolManager) processBlocks() error {
 		max := int(math.Min(float64(len(blocks)), float64(blockProcAmount)))
 		_, err := pm.chainman.InsertChain(blocks[:max])
 		if err != nil {
-			// cancel download process
+			glog.V(logger.Warn).Infof("Block insertion failed: %v", err)
 			pm.downloader.Cancel()
-
 			return err
 		}
 		blocks = blocks[max:]
@@ -95,11 +101,13 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
 	case downloader.ErrBusy:
 		glog.V(logger.Debug).Infof("Synchronisation already in progress")
 
-	case downloader.ErrTimeout:
-		glog.V(logger.Debug).Infof("Removing peer %v due to sync timeout", peer.id)
+	case downloader.ErrTimeout, downloader.ErrBadPeer, downloader.ErrInvalidChain, downloader.ErrCrossCheckFailed:
+		glog.V(logger.Debug).Infof("Removing peer %v: %v", peer.id, err)
 		pm.removePeer(peer)
+
 	case downloader.ErrPendingQueue:
 		glog.V(logger.Debug).Infoln("Synchronisation aborted:", err)
+
 	default:
 		glog.V(logger.Warn).Infof("Synchronisation failed: %v", err)
 	}