Move slow hardware warning print logic to CLI (paritytech#13198)

* Move slow hardware warning print logic to CLI Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update client/sysinfo/src/sysinfo.rs Co-authored-by: Bastian Köcher <git@kchr.de> * fmt Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Bastian Köcher <git@kchr.de>
ltfschoen · Feb 22, 2023 · 4fa574d · 4fa574d
1 parent 681b784
commit 4fa574d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 48 deletions.
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
@@ -318,18 +318,12 @@ pub fn new_full_base(
 		&sc_consensus_babe::BabeLink<Block>,
 	),
 ) -> Result<NewFullBase, ServiceError> {
-	let hwbench = if !disable_hardware_benchmarks {
-		config.database.path().map(|database_path| {
+	let hwbench = (!disable_hardware_benchmarks)
+		.then_some(config.database.path().map(|database_path| {
 			let _ = std::fs::create_dir_all(&database_path);
-			sc_sysinfo::gather_hwbench(
-				Some(database_path),
-				SUBSTRATE_REFERENCE_HARDWARE.clone(),
-				config.role.is_authority(),
-			)
-		})
-	} else {
-		None
-	};
+			sc_sysinfo::gather_hwbench(Some(database_path))
+		}))
+		.flatten();
 
 	let sc_service::PartialComponents {
 		client,
@@ -403,6 +397,11 @@ pub fn new_full_base(
 
 	if let Some(hwbench) = hwbench {
 		sc_sysinfo::print_hwbench(&hwbench);
+		if !SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) && role.is_authority() {
+			log::warn!(
+				"⚠️  The hardware does not meet the minimal requirements for role 'Authority'."
+			);
+		}
 
 		if let Some(ref mut telemetry) = telemetry {
 			let telemetry_handle = telemetry.handle();

diff --git a/client/sysinfo/src/sysinfo.rs b/client/sysinfo/src/sysinfo.rs
@@ -591,11 +591,7 @@ pub fn benchmark_sr25519_verify(limit: ExecutionLimit) -> Throughput {
 /// Optionally accepts a path to a `scratch_directory` to use to benchmark the
 /// disk. Also accepts the `requirements` for the hardware benchmark and a
 /// boolean to specify if the node is an authority.
-pub fn gather_hwbench(
-	scratch_directory: Option<&Path>,
-	requirements: Requirements,
-	is_authority: bool,
-) -> HwBench {
+pub fn gather_hwbench(scratch_directory: Option<&Path>) -> HwBench {
 	#[allow(unused_mut)]
 	let mut hwbench = HwBench {
 		cpu_hashrate_score: benchmark_cpu(DEFAULT_CPU_EXECUTION_LIMIT),
@@ -625,42 +621,38 @@ pub fn gather_hwbench(
 			};
 	}
 
-	if is_authority {
-		ensure_requirements(hwbench.clone(), requirements);
-	}
-
 	hwbench
 }
 
-fn ensure_requirements(hwbench: HwBench, requirements: Requirements) {
-	let mut failed = 0;
-	for requirement in requirements.0.iter() {
-		match requirement.metric {
-			Metric::Blake2256 =>
-				if requirement.minimum > hwbench.cpu_hashrate_score {
-					failed += 1;
-				},
-			Metric::MemCopy =>
-				if requirement.minimum > hwbench.memory_memcpy_score {
-					failed += 1;
-				},
-			Metric::DiskSeqWrite =>
-				if let Some(score) = hwbench.disk_sequential_write_score {
-					if requirement.minimum > score {
-						failed += 1;
-					}
-				},
-			Metric::DiskRndWrite =>
-				if let Some(score) = hwbench.disk_random_write_score {
-					if requirement.minimum > score {
-						failed += 1;
-					}
-				},
-			Metric::Sr25519Verify => {},
+impl Requirements {
+	/// Whether the hardware requirements are met by the provided benchmark results.
+	pub fn check_hardware(&self, hwbench: &HwBench) -> bool {
+		for requirement in self.0.iter() {
+			match requirement.metric {
+				Metric::Blake2256 =>
+					if requirement.minimum > hwbench.cpu_hashrate_score {
+						return false
+					},
+				Metric::MemCopy =>
+					if requirement.minimum > hwbench.memory_memcpy_score {
+						return false
+					},
+				Metric::DiskSeqWrite =>
+					if let Some(score) = hwbench.disk_sequential_write_score {
+						if requirement.minimum > score {
+							return false
+						}
+					},
+				Metric::DiskRndWrite =>
+					if let Some(score) = hwbench.disk_random_write_score {
+						if requirement.minimum > score {
+							return false
+						}
+					},
+				Metric::Sr25519Verify => {},
+			}
 		}
-	}
-	if failed != 0 {
-		log::warn!("⚠️  Your hardware performance score was less than expected for role 'Authority'. See https://wiki.polkadot.network/docs/maintain-guides-how-to-validate-polkadot#reference-hardware");
+		true
 	}
 }