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

[cp][aptos-release-v1.24] [1.23] Temporarily loosen backpressures, until module loading improvement speeds up blocks #15397

Closed
wants to merge 1 commit into from
Closed

[cp][aptos-release-v1.24] [1.23] Temporarily loosen backpressures, until module loading improvement speeds up blocks #15397

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions config/src/config/consensus_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,17 @@ impl Default for ConsensusConfig {
min_max_txns_in_block_after_filtering_from_backpressure: MIN_BLOCK_TXNS_AFTER_FILTERING,
execution_backpressure: Some(ExecutionBackpressureConfig {
num_blocks_to_look_at: 20,
<<<<<<< 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)
Comment on lines +199 to +209
Copy link

Choose a reason for hiding this comment

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

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
Copy link

Choose a reason for hiding this comment

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

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: 200

Spotted by Graphite Reviewer

Is this helpful? React 👍 or 👎 to let us know.

// allow at least two spreading group from reordering in a single block, to utilize paralellism
min_calibrated_txns_per_block: 8,
}),
Expand Down