Update fdlimit crate and handle errors gracefully instead of catchi…

…ng panics
paritytech · Nov 9, 2023 · 1537b4d · 1537b4d
1 parent e2046c2
commit 1537b4d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 array-bytes = "6.1"
 chrono = "0.4.27"
 clap = { version = "4.4.6", features = ["derive", "string", "wrap_help"] }
-fdlimit = "0.2.1"
+fdlimit = "0.3.0"
 futures = "0.3.21"
 itertools = "0.10.3"
 libp2p-identity = { version = "0.1.3", features = ["peerid", "ed25519"]}

diff --git a/substrate/client/cli/src/config.rs b/substrate/client/cli/src/config.rs
@@ -605,29 +605,19 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 
 		logger.init()?;
 
-		match std::panic::catch_unwind(fdlimit::raise_fd_limit) {
-			Ok(Some(new_limit)) =>
-				if new_limit < RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT {
+		match fdlimit::raise_fd_limit() {
+			Ok(fdlimit::Outcome::LimitRaised { to, .. }) =>
+				if to < RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT {
 					warn!(
 						"Low open file descriptor limit configured for the process. \
 						Current value: {:?}, recommended value: {:?}.",
-						new_limit, RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT,
+						to, RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT,
 					);
 				},
-			Ok(None) => {
+			Ok(fdlimit::Outcome::Unsupported) => {
 				// Unsupported platform (non-Linux)
 			},
 			Err(error) => {
-				let error = if let Some(error) = error.downcast_ref::<&str>() {
-					*error
-				} else if let Some(error) = error.downcast_ref::<String>() {
-					error
-				} else {
-					unreachable!(
-						"Should be unreachable as `fdlimit` uses panic macro, \
-						which should return either `&str` or `String`"
-					)
-				};
 				warn!(
 					"Failed to configure file descriptor limit for the process: \
 					{}, recommended value: {:?}.",

diff --git a/substrate/client/service/test/Cargo.toml b/substrate/client/service/test/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-channel = "1.8.0"
 array-bytes = "6.1"
-fdlimit = "0.2.1"
+fdlimit = "0.3.0"
 futures = "0.3.21"
 log = "0.4.17"
 parity-scale-codec = "3.6.1"

diff --git a/substrate/client/service/test/src/lib.rs b/substrate/client/service/test/src/lib.rs
@@ -285,7 +285,7 @@ where
 		base_port: u16,
 	) -> TestNet<G, E, F, U> {
 		sp_tracing::try_init_simple();
-		fdlimit::raise_fd_limit();
+		fdlimit::raise_fd_limit().unwrap();
 		let runtime = Runtime::new().expect("Error creating tokio runtime");
 		let mut net = TestNet {
 			runtime,