Use setTimer on Network.discover #919
Merged
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
|
TrustHenry
changed the title
TrustHenry
force-pushed
the
usesettimer
branch
3 times, most recently
from
687d753
to
b498e04
Compare
TrustHenry
changed the title
TrustHenry
force-pushed
the
usesettimer
branch
2 times, most recently
from
86aeb98
to
0dfc8e0
Compare
|
I applied @AndrejMitrovic suggestions. |
source/agora/node/FullNode.d
Outdated
| this.taskman.wait(5.seconds); | ||
| } | ||
| }); | ||
| scope void discover () { this.network.discover(); } |
There was a problem hiding this comment.
This is wrong. It should not be a scope delegate. If it's scope, it will be allocated on the stack. So when start() returns and the timer tries to call discover, it may crash.
There was a problem hiding this comment.
In fact, I was worried.
source/agora/node/Validator.d
Outdated
| this.network.discover(required_peer_keys); | ||
| this.taskman.wait(5.seconds); | ||
| } | ||
| scope void discover () { this.network.discover(required_peer_keys); } |
There was a problem hiding this comment.
also make it non-scope.
source/agora/node/FullNode.d
Outdated
| this.taskman.wait(5.seconds); | ||
| } | ||
| }); | ||
| void discover () { this.network.discover(); } |
There was a problem hiding this comment.
You don't need the startPeriodicDiscovery function anymore. And also:
Sorry I thought that we don't need the runTask, but actually it would make sense to run it inside a task to make it non blocking.
How about we use the same technique which you did in the Validator?
So startPeriodicDiscovery with a runTask inside, and start would call it first and then startPeriodicCatchup. Inside startPeriodicDiscovery you would have this void discover and the setting up of the timer.
Do you see what I mean?
There was a problem hiding this comment.
It's good to make the FullNode and Validator consistent.
There was a problem hiding this comment.
It's good to be consistent. It's been applied.
source/agora/node/FullNode.d
Outdated
| @@ -154,7 +154,7 @@ public class FullNode : API | |||
|
|
|||
| public void start () | |||
| { | |||
| this.startPeriodicDiscovery(); | |||
| startPeriodicDiscovery(); | |||
There was a problem hiding this comment.
Just missing this. and then it's ready to go.
There was a problem hiding this comment.
The catch is too fast!
These need to be replaced to use setTimer once TaskManager is fixed to use it.
AndrejMitrovic
approved these changes
Jun 3, 2020
Codecov Report
@@ Coverage Diff @@
## v0.x.x #919 +/- ##
==========================================
+ Coverage 90.24% 90.42% +0.17%
==========================================
Files 71 71
Lines 5650 5669 +19
==========================================
+ Hits 5099 5126 +27
+ Misses 551 543 -8
Continue to review full report at Codecov.
|
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.
Two improvements are needed here.
Taskmanager.setTimeriswaitandcallaction.So I call first to eliminate the delay in the first run.
Currently, this kind of movement causes the error as below.
Second
Validator.startPeriodicDiscoveryThis is unnecessary repetitive behavior of
buildRequiredKeysRelates #872