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

Increase base consensus timeout and make it a config #4532

Merged
merged 1 commit into from
Sep 8, 2022
Merged

Increase base consensus timeout and make it a config #4532

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions crates/sui-config/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
let consensus_config = ConsensusConfig {
consensus_address,
consensus_db_path,
delay_step: Some(15_000),
narwhal_config: Default::default(),
};

Expand Down
1 change: 1 addition & 0 deletions crates/sui-config/src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ impl NodeConfig {
pub struct ConsensusConfig {
pub consensus_address: Multiaddr,
pub consensus_db_path: PathBuf,
pub delay_step: Option<u64>,
Copy link
Contributor

Choose a reason for hiding this comment

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

Alternatively I think it may be cleaner if you don't use Option here but provide a serde default?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, too late :)
I don't really have a strong opinion on that, can use default next time

Copy link
Contributor

Choose a reason for hiding this comment

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

The benefit of serde default is that we can then deploy this without a new config file

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it is same with Option, it deserializes to None by default


pub narwhal_config: ConsensusParameters,
}
Expand Down
7 changes: 7 additions & 0 deletions crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ validator_configs:
consensus-config:
consensus-address: ""
consensus-db-path: /tmp/foo/
delay-step: 15000
narwhal-config:
header_size: 1000
max_header_delay: 100ms
Expand Down Expand Up @@ -55,6 +56,7 @@ validator_configs:
consensus-config:
consensus-address: ""
consensus-db-path: /tmp/foo/
delay-step: 15000
narwhal-config:
header_size: 1000
max_header_delay: 100ms
Expand Down Expand Up @@ -95,6 +97,7 @@ validator_configs:
consensus-config:
consensus-address: ""
consensus-db-path: /tmp/foo/
delay-step: 15000
narwhal-config:
header_size: 1000
max_header_delay: 100ms
Expand Down Expand Up @@ -135,6 +138,7 @@ validator_configs:
consensus-config:
consensus-address: ""
consensus-db-path: /tmp/foo/
delay-step: 15000
narwhal-config:
header_size: 1000
max_header_delay: 100ms
Expand Down Expand Up @@ -175,6 +179,7 @@ validator_configs:
consensus-config:
consensus-address: ""
consensus-db-path: /tmp/foo/
delay-step: 15000
narwhal-config:
header_size: 1000
max_header_delay: 100ms
Expand Down Expand Up @@ -215,6 +220,7 @@ validator_configs:
consensus-config:
consensus-address: ""
consensus-db-path: /tmp/foo/
delay-step: 15000
narwhal-config:
header_size: 1000
max_header_delay: 100ms
Expand Down Expand Up @@ -255,6 +261,7 @@ validator_configs:
consensus-config:
consensus-address: ""
consensus-db-path: /tmp/foo/
delay-step: 15000
narwhal-config:
header_size: 1000
max_header_delay: 100ms
Expand Down
3 changes: 2 additions & 1 deletion crates/sui-core/src/authority_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,13 @@ impl ValidatorService {

let metrics = ConsensusAdapterMetrics::new(&prometheus_registry);

let delay_step = consensus_config.delay_step.unwrap_or(15_000);
// The consensus adapter allows the authority to send user certificates through consensus.
let consensus_adapter = ConsensusAdapter::new(
consensus_config.address().to_owned(),
state.clone_committee(),
tx_sui_to_consensus.clone(),
/* max_delay */ Duration::from_millis(5_000),
Duration::from_millis(delay_step),
metrics.clone(),
);

Expand Down
19 changes: 9 additions & 10 deletions crates/sui-core/src/consensus_adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,11 @@ pub struct ConsensusAdapter {
committee: Committee,
/// A channel to notify the consensus listener to take action for a transactions.
tx_consensus_listener: Sender<ConsensusListenerMessage>,
/// The maximum duration to wait from consensus before aborting the transaction. After
/// this delay passed, the client will be notified that its transaction was probably not
/// sequence and it should try to resubmit its transaction.
max_delay: Duration,
/// Additional amount on top of delay_ms to calculate consensus timeout
/// Worst case consensus timeout grows linearly by adding delay_step every timeout
delay_step: Duration,

/// Estimation of the conensus delay, to use to dynamically adjust the delay
/// Estimation of the consensus delay, to use to dynamically adjust the delay
/// before we time out, so that we do not spam the consensus adapter with the
/// same transaction.
delay_ms: AtomicU64,
Expand All @@ -227,7 +226,7 @@ impl ConsensusAdapter {
consensus_address: Multiaddr,
committee: Committee,
tx_consensus_listener: Sender<ConsensusListenerMessage>,
max_delay: Duration,
delay_step: Duration,
opt_metrics: OptArcConsensusAdapterMetrics,
) -> Self {
let consensus_client = TransactionsClient::new(
Expand All @@ -238,8 +237,8 @@ impl ConsensusAdapter {
consensus_client,
committee,
tx_consensus_listener,
max_delay,
delay_ms: AtomicU64::new(max_delay.as_millis() as u64),
delay_step,
delay_ms: AtomicU64::new(delay_step.as_millis() as u64),
opt_metrics,
}
}
Expand Down Expand Up @@ -310,7 +309,7 @@ impl ConsensusAdapter {
// client to retry if we timeout without hearing back from consensus (this module does not
// handle retries). The best timeout value depends on the consensus protocol.
let back_off_delay =
self.max_delay + Duration::from_millis(self.delay_ms.load(Ordering::Relaxed));
self.delay_step + Duration::from_millis(self.delay_ms.load(Ordering::Relaxed));
let result = match timeout(back_off_delay, waiter.wait_for_result()).await {
Ok(_) => {
// Increment the attempted certificate sequencing success
Expand Down Expand Up @@ -345,7 +344,7 @@ impl ConsensusAdapter {
// but all we really need here is some max so that we do not wait for ever
// in case consensus if dead.
let new_delay =
new_delay.min((self.max_delay.as_millis() as u64) * MAX_DELAY_MULTIPLIER);
new_delay.min((self.delay_step.as_millis() as u64) * MAX_DELAY_MULTIPLIER);

// Store the latest latency
self.opt_metrics.as_ref().map(|metrics| {
Expand Down