[cp][aptos-release-v1.24] [1.23] Temporarily loosen backpressures, until module loading improvement speeds up blocks #15397
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…eeds up blocks (cherry picked from commit c7fe444) # Conflicts: # config/src/config/consensus_config.rs
github-actions
bot
requested review from
JoshLind and
gregnazario
as code owners
Merged
22 tasks
![graphite-app[bot]](https://avatars.githubusercontent.com/in/158384?s=60&v=4){kind=small}
Comment on lines
+199
to
+209
| <<<<<<< HEAD | ||
| min_blocks_to_activate: 4, | ||
| percentile: 0.5, | ||
| target_block_time_ms: 200, | ||
| min_block_time_ms_to_activate: 100, | ||
| ======= | ||
| min_blocks_to_activate: 10, | ||
| percentile: 0.5, | ||
| target_block_time_ms: 350, | ||
| min_block_time_ms_to_activate: 200, | ||
| >>>>>>> c7fe444994 (Temporarily loosen backpressures, until module loading improvement speeds up blocks) |
There was a problem hiding this comment.
This code contains Git merge conflict markers (<<<<<<<, =======, >>>>>>>). Please resolve the conflict by removing these markers and keeping only the new values:
min_blocks_to_activate: 10,
percentile: 0.5,
target_block_time_ms: 350,
min_block_time_ms_to_activate: 200,Spotted by Graphite Reviewer
Is this helpful? React 👍 or 👎 to let us know.
Comment on lines
+199
to
+209
| <<<<<<< HEAD | ||
| min_blocks_to_activate: 4, | ||
| percentile: 0.5, | ||
| target_block_time_ms: 200, | ||
| min_block_time_ms_to_activate: 100, | ||
| ======= | ||
| min_blocks_to_activate: 10, | ||
| percentile: 0.5, | ||
| target_block_time_ms: 350, | ||
| min_block_time_ms_to_activate: 200, | ||
| >>>>>>> c7fe444994 (Temporarily loosen backpressures, until module loading improvement speeds up blocks) |
There was a problem hiding this comment.
Please resolve the Git merge conflict markers and retain only the relaxed backpressure configuration:
min_blocks_to_activate: 10,
percentile: 0.5,
target_block_time_ms: 350,
min_block_time_ms_to_activate: 200Spotted by Graphite Reviewer
Is this helpful? React 👍 or 👎 to let us know.
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.
Backport
This will backport the following commits from
aptos-release-v1.23toaptos-release-v1.24:Questions ?
Please refer to the Backport tool documentation