eth: update highest block we know during the sync if a higher was found #16283
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rjl493456442
force-pushed
the
fix_highest_block
branch
from
ecdba2e to
ea04ad0
Compare
karalabe
reviewed
Mar 8, 2018
internal/ethapi/api.go
Outdated
| @@ -80,7 +80,7 @@ func (s *PublicEthereumAPI) Syncing() (interface{}, error) { | |||
| progress := s.b.Downloader().Progress() | |||
|
|
|||
| // Return not syncing if the synchronisation already completed | |||
| if progress.CurrentBlock >= progress.HighestBlock { | |||
| if !s.b.Downloader().Synchronising() { | |||
There was a problem hiding this comment.
This won't be a good change:
// Synchronising returns whether the downloader is currently retrieving blocks.
func (d *Downloader) Synchronising() bool {
return atomic.LoadInt32(&d.synchronising) > 0
}During the node's initial sync (and maybe even afterwards), sync will abort and restart a few times if the master peer we're connected to disappears. The current code progress.CurrentBlock >= progress.HighestBlock doesn't care about that, and will just report syncing until we're actually in sync. Your change would report sync done whenever the downloader aborts for a few second.
rjl493456442
force-pushed
the
fix_highest_block
branch
from
92ed5c4 to
12c61d8
Compare
|
@karalabe Updated. |
karalabe
requested changes
Mar 8, 2018
rjl493456442
force-pushed
the
fix_highest_block
branch
from
12c61d8 to
548eb6b
Compare
|
@karalabe Please take a look again |
karalabe
reviewed
Mar 9, 2018
eth/sync.go
Outdated
| // Make sure the peer's total difficulty we are synchronizing is higher. | ||
| if pm.blockchain.GetTdByHash(pm.blockchain.CurrentFastBlock().Hash()).Cmp(pTd) >= 0 { | ||
| return | ||
| } |
There was a problem hiding this comment.
This is only one path where fast sync is enabled, the above if branch also enables fast sync.
Please move these two lines below outside of both branches, and do something like
if mode == downloader.FastSync {
if pm.blockchain.GetTdByHash(pm.blockchain.CurrentFastBlock().Hash()).Cmp(pTd) >= 0 {
return
}
}
rjl493456442
force-pushed
the
fix_highest_block
branch
from
548eb6b to
920c49d
Compare
karalabe
approved these changes
Mar 9, 2018
fjl
changed the title
prestonvanloon
pushed a commit
to prestonvanloon/go-ethereum
that referenced
this pull request
Apr 2, 2018
ethereum#16283) * eth: update higest block we know during the sync if a higher was found * eth: avoid useless sync in fast sync
hackmod
pushed a commit
to OpenCommunityCoin/go-esn
that referenced
this pull request
Jul 9, 2018
ethereum#16283) * eth: update higest block we know during the sync if a higher was found * eth: avoid useless sync in fast sync
mariameda
pushed a commit
to NiluPlatform/go-nilu
that referenced
this pull request
Aug 23, 2018
ethereum#16283) * eth: update higest block we know during the sync if a higher was found * eth: avoid useless sync in fast sync
firmianavan
pushed a commit
to firmianavan/go-ethereum
that referenced
this pull request
Aug 28, 2018
ethereum#16283) * eth: update higest block we know during the sync if a higher was found * eth: avoid useless sync in fast sync
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this PR, fix two problems:
Avoid useless synchronization during the fast sync if the peer doesn't have higher difficulty than our fast block head.
Update highest block we know during the sync