Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improving the request of tasks of TaskManager (2x) #900

Merged
merged 7 commits into from
Aug 6, 2019
Merged

Improving the request of tasks of TaskManager (2x) #900

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f16cd47
Drop the duplicate NewTasks for the TaskManagerMailbox
yongjiema Jul 9, 2019
42d6b88
Try to get headers from remote nodes if the current header is not upd…
yongjiema Jul 9, 2019
f9cef24
Merge branch 'master-2.x' into fix-sync-stuck-2.x
vncoelho Jul 9, 2019
ee95314
Merge branch 'master-2.x' into fix-sync-stuck-2.x
shargon Jul 13, 2019
eb5ec67
Try to get headers from remote nodes even the current header height i…
yongjiema Jul 22, 2019
0dfca83
Merge branch 'master-2.x' into fix-sync-stuck-2.x
shargon Jul 29, 2019
e4f106d
Removing Shall Drop to another PR
vncoelho Aug 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion neo/Network/P2P/TaskManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,11 @@ private void RequestTasks(TaskSession session)
return;
}
}
if ((!HasHeaderTask || globalTasks[HeaderTaskHash] < MaxConncurrentTasks) && Blockchain.Singleton.HeaderHeight < session.Version.StartHeight)
if ((!HasHeaderTask || globalTasks[HeaderTaskHash] < MaxConncurrentTasks)
&& (Blockchain.Singleton.HeaderHeight < session.Version.StartHeight
|| (Blockchain.Singleton.Height == Blockchain.Singleton.HeaderHeight
&& Blockchain.Singleton.HeaderHeight >= sessions.Select(x => x.Value.Version.StartHeight).Max()
&& TimeProvider.Current.UtcNow.ToTimestamp() - 60 >= Blockchain.Singleton.GetBlock(Blockchain.Singleton.CurrentHeaderHash)?.Timestamp)))
{
session.Tasks[HeaderTaskHash] = DateTime.UtcNow;
IncrementGlobalTask(HeaderTaskHash);
Expand Down