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.

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

enable approval-voting-parallel on polkadot #7504

Merged
merged 5 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions polkadot/cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

pub use polkadot_node_primitives::NODE_VERSION;

use clap::Parser;
use clap::{ArgAction, Parser};
use std::path::PathBuf;

#[allow(missing_docs)]
Expand Down Expand Up @@ -148,9 +148,9 @@ pub struct RunCmd {

/// Enable approval-voting message processing in parallel.
///
///**Dangerous!** This is an experimental feature and should not be used in production, unless
/// explicitly advised to.
#[arg(long)]
/// This is a flag used for gradually enabling approval-voting-parallel in production,
/// should not be used unless explicitly advised to. It will be removed in the future.
#[arg(long, default_value = "true", action=ArgAction::Set)]
sw10pa marked this conversation as resolved.
Show resolved Hide resolved
pub enable_approval_voting_parallel: bool,
}

Expand Down
7 changes: 0 additions & 7 deletions polkadot/node/service/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -759,13 +759,6 @@ pub fn new_full<
Some(backoff)
};

// Running approval voting in parallel is enabled by default on all networks except Polkadot
// unless explicitly enabled by the commandline option.
// This is meant to be temporary until we have enough confidence in the new system to enable it
// by default on all networks.
let enable_approval_voting_parallel =
!config.chain_spec.is_polkadot() || enable_approval_voting_parallel;

let disable_grandpa = config.disable_grandpa;
let name = config.network.node_name.clone();

Expand Down
11 changes: 11 additions & 0 deletions prdoc/pr_7504.prdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title: Enable approval-voting-parallel by default on polkadot

doc:
- audience: Node Dev
description: |
Enable approval-voting-parallel by default on polkadot
crates:
- name: polkadot-service
bump: patch
- name: polkadot-cli
bump: patch
Loading