This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
[PAN-2265] Expose fast-sync options on command line #1218
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
- add `--fast-sync-min-peers` hidden cli option - add `--fast-sync-max-wait-time` hidden cli option - update `FastSyncActions` to handle no timeout behaviour (when timeout set to 0 or no timeout set then we just trigger asynchrounously the waitPeersTask) - update unit tests mock related to sync config builder - add fast sync options in `everything_config.toml` - re enable `PantheonCommandTest.syncModeOptionMustBeUsed` fix PAN-2265 fixes PAN-2265
NicolasMassart
suggested changes
Apr 4, 2019
pantheon/src/main/java/tech/pegasys/pantheon/cli/DefaultCommandValues.java
Outdated
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Outdated
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Outdated
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Outdated
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Outdated
Show resolved
Hide resolved
pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java
Show resolved
Hide resolved
- fix coding style convention - add unit tests
NicolasMassart
approved these changes
Apr 4, 2019
pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java
Outdated
Show resolved
Hide resolved
pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java
Outdated
Show resolved
Hide resolved
PR discussion
spotlessApply
mbaxter
reviewed
Apr 4, 2019
...reum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActions.java
Outdated
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Outdated
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Outdated
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Outdated
Show resolved
Hide resolved
pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java
Outdated
Show resolved
Hide resolved
pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/cli/DefaultCommandValues.java
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Outdated
Show resolved
Hide resolved
…nd.java Co-Authored-By: abdelhamidbakhta <[email protected]>
…nd.java Co-Authored-By: abdelhamidbakhta <[email protected]>
…nd.java Co-Authored-By: abdelhamidbakhta <[email protected]>
shemnon
reviewed
Apr 4, 2019
...reum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActions.java
Outdated
Show resolved
Hide resolved
...reum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActions.java
Outdated
Show resolved
Hide resolved
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Outdated
Show resolved
Hide resolved
| @@ -658,6 +678,19 @@ public void run() { | |||
| } | |||
| } | |||
|
|
|||
| private void checkFastSyncOptions() throws ParameterException { | |||
| if (fastSyncMaxWaitTime < 0) { | |||
There was a problem hiding this comment.
Our parameter validation has been more just in time and directly in the configuration options rather than directly between the CLI and the config. It keeps the validations closer to where the parameters are actually stored. Validating in the CLI also provides a barrier to splitting the code apart.
There was a problem hiding this comment.
A custom converter to restrict the integer to a positive non null one ?
There was a problem hiding this comment.
None of other integers have restriction. For example metrics interval in seconds are not checked too. So what is the best practice to perform those checks ?
There was a problem hiding this comment.
I suggest we keep like this for this PR. We need to define a way to do this kind of checks and implement it for all options in a separate ticket imo.
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Outdated
Show resolved
Hide resolved
pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java
Show resolved
Hide resolved
set timeout to 5 minutes
…expose-fast-sync-opts-cli
add unit tests
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
PR description
add
--fast-sync-min-peershidden cli optionadd
--fast-sync-max-wait-timehidden cli optionupdate
FastSyncActionsto handle no timeout behaviour (when timeout set to 0 or no timeout set then we just trigger asynchrounously the waitPeersTask)update unit tests mock related to sync config builder
add fast sync options in
everything_config.tomlre enable
PantheonCommandTest.syncModeOptionMustBeUsedFixed Issue(s)