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 6 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
15 changes: 14 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 @@ -5,6 +5,7 @@
using Neo.Ledger;
using Neo.Network.P2P.Payloads;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
Expand Down Expand Up @@ -227,7 +228,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 Expand Up @@ -272,5 +277,13 @@ internal protected override bool IsHighPriority(object message)
return false;
}
}

internal protected override bool ShallDrop(object message, IEnumerable queue)
{
if (!(message is TaskManager.NewTasks tasks)) return false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yongjiema, maybe add this case before the removal of duplicated tasks on line 285:
check if message is a task with tasks.Payload.Type == InventoryType.Consensus.

Because I believe that we do not need the next check for blocks, correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean adding the below code between line 283 and line 285?

if (tasks.Payload.Type == InventoryType.Consensus) return false;

But I think it doesn't matter for Consensus or Block as both are high priority, I think you can try TX, but I think it may slow down the transaction broadcast.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean the contrary if (tasks.Payload.Type != InventoryType.Consensus) return false;
aehauheuaea

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can try it as most duplicated tasks are consensus, but it still got a chance to make the sync stuck or the empty block happen.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yongjiema, what I am saying is exactly in this line of reasoning, to avoid the check for blocks, since the most duplicated are consensus. Thus, we would save some efficiency be not needing to check the Queue when it is not Consensus.

// Remove duplicate tasks
if (queue.OfType<TaskManager.NewTasks>().Any(x => x.Payload.Type == tasks.Payload.Type && x.Payload.Hashes.SequenceEqual(tasks.Payload.Hashes))) return true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (queue.OfType<TaskManager.NewTasks>().Any(x => x.Payload.Type == tasks.Payload.Type && x.Payload.Hashes.SequenceEqual(tasks.Payload.Hashes))) return true;
if (queue.OfType<TaskManager.NewTasks>().AsParallel().Any(x => x.Payload.Type == tasks.Payload.Type && x.Payload.Hashes.SequenceEqual(tasks.Payload.Hashes))) return true;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am worried that this will lead to blockage.

Can we just limit the length of the mailbox, and if it exceeds a certain length, we will abandon the new package directly?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about create a merkle tree for make this faster?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In NEO3, we can make each InvPayload only contain one hash, because in fact we have almost no usage of multiple hashes in one InvPayload.

In NEO2, we urgently need to solve the empty block and the sync stuck problem, so I think that no matter what method can be used as long as it can solve the problem.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My proposal is use this patch, but with a merkle tree

Copy link
Member

@shargon shargon Jul 30, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In NEO3, we can make each InvPayload only contain one hash, because in fact we have almost no usage of multiple hashes in one InvPayload.

There are some lines that use this multiple hashes

neo/neo/Consensus/ConsensusService.cs

Line 445 in cd99489

Payload = InvPayload.Create(InventoryType.TX, hashes)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shargon, currently this will cause also an attack, even with this fix PR, right?

return false;
}
}
}