From 2019ed71b4758956a8bd9671c73ba98a244f4a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 28 Oct 2015 16:41:01 +0200
Subject: [PATCH] eth: don't block sync goroutines that short circuit

---
 eth/downloader/downloader.go | 6 ++++--
 eth/sync.go                  | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 4bcbd85577..153427ee48 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -248,10 +248,11 @@ func (d *Downloader) UnregisterPeer(id string) error {
 
 // Synchronise tries to sync up our local block chain with a remote peer, both
 // adding various sanity checks as well as wrapping it with various log entries.
-func (d *Downloader) Synchronise(id string, head common.Hash, td *big.Int, mode SyncMode) {
+func (d *Downloader) Synchronise(id string, head common.Hash, td *big.Int, mode SyncMode) error {
 	glog.V(logger.Detail).Infof("Attempting synchronisation: %v, head [%x…], TD %v", id, head[:4], td)
 
-	switch err := d.synchronise(id, head, td, mode); err {
+	err := d.synchronise(id, head, td, mode)
+	switch err {
 	case nil:
 		glog.V(logger.Detail).Infof("Synchronisation completed")
 
@@ -268,6 +269,7 @@ func (d *Downloader) Synchronise(id string, head common.Hash, td *big.Int, mode
 	default:
 		glog.V(logger.Warn).Infof("Synchronisation failed: %v", err)
 	}
+	return err
 }
 
 // synchronise will select the peer and use it for synchronising. If an empty string is given
diff --git a/eth/sync.go b/eth/sync.go
index b69a24556b..bbf2abc048 100644
--- a/eth/sync.go
+++ b/eth/sync.go
@@ -170,13 +170,16 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
 	if pm.fastSync {
 		mode = downloader.FastSync
 	}
-	pm.downloader.Synchronise(peer.id, peer.Head(), peer.Td(), mode)
-
+	if err := pm.downloader.Synchronise(peer.id, peer.Head(), peer.Td(), mode); err != nil {
+		return
+	}
 	// If fast sync was enabled, and we synced up, disable it
 	if pm.fastSync {
+		// Wait until all pending imports finish processing
 		for pm.downloader.Synchronising() {
 			time.Sleep(100 * time.Millisecond)
 		}
+		// Disable fast sync if we indeed have something in our chain
 		if pm.blockchain.CurrentBlock().NumberU64() > 0 {
 			glog.V(logger.Info).Infof("fast sync complete, auto disabling")
 			pm.fastSync = false