[stable2412] Backport #7504 (#7510)

Backport #7504 into `stable2412` from alexggh.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

Co-authored-by: Alexandru Gheorghe <49718502+alexggh@users.noreply.github.com>

polkadot/cli/src/cli.rs

@@ -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)]
@@ -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)]
 	pub enable_approval_voting_parallel: bool,
 }
 

polkadot/node/service/src/lib.rs

@@ -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();
 

prdoc/pr_7504.prdoc

+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