Merge pull request #9 from subspace/cherry-pick-2155-pr

Do not panic if the fdlimit call to increase the file descriptor limit fails (cherrypicked)
autonomys · Dec 1, 2023 · c63a8b2 · c63a8b2
2 parents 4c82ce2 + ce02703
commit c63a8b2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
@@ -17,7 +17,7 @@ array-bytes = "6.1"
 atomic = "0.5.3"
 chrono = "0.4.27"
 clap = { version = "4.4.3", features = ["derive", "string"] }
-fdlimit = "0.2.1"
+fdlimit = "0.3.0"
 futures = "0.3.21"
 libp2p-identity = { version = "0.1.3", features = ["peerid", "ed25519"]}
 log = "0.4.17"

diff --git a/substrate/client/cli/src/config.rs b/substrate/client/cli/src/config.rs
@@ -614,14 +614,25 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 
 		logger.init()?;
 
-		if let Some(new_limit) = fdlimit::raise_fd_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: {:?}.",
+						to, RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT,
+					);
+				},
+			Ok(fdlimit::Outcome::Unsupported) => {
+				// Unsupported platform (non-Linux)
+			},
+			Err(error) => {
 				warn!(
-					"Low open file descriptor limit configured for the process. \
-					Current value: {:?}, recommended value: {:?}.",
-					new_limit, RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT,
+					"Failed to configure file descriptor limit for the process: \
+					{}, recommended value: {:?}.",
+					error, RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT,
 				);
-			}
+			},
 		}
 
 		Ok(())

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
@@ -286,7 +286,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,