Revert rlimit customization changes (those are overkill)

Signed-off-by: Valerian Saliou <valerian@valeriansaliou.name>

CONFIGURATION.md

@@ -8,7 +8,6 @@ Sonic Configuration
 **[server]**
 
 * `log_level` (type: _string_, allowed: `debug`, `info`, `warn`, `error`, default: `error`) — Verbosity of logging, set it to `error` in production
-* `limit_open_files` (type: _integer_, allowed: numbers, default: `1024`) — Maximum number of open files for the process (raise this limit if you run a large deployment; check that your system security limits allow this)
 
 **[channel]**
 

Cargo.toml

@@ -29,7 +29,6 @@ lazy_static = "1.3"
 serde = "1.0"
 serde_derive = "1.0"
 graceful = "0.1"
-libc = "0.2"
 rand = "0.6"
 unicode-segmentation = "1.2"
 rocksdb = { version = "0.12", features = ["lz4"] }

config.cfg

@@ -8,8 +8,6 @@
 
 log_level = "error"
 
-limit_open_files = 1024
-
 
 [channel]
 

src/config/config.rs

@@ -20,9 +20,6 @@ pub struct Config {
 pub struct ConfigServer {
     #[serde(default = "defaults::server_log_level")]
     pub log_level: String,
-
-    #[serde(default = "defaults::server_limit_open_files")]
-    pub limit_open_files: u64,
 }
 
 #[derive(Deserialize)]

src/config/defaults.rs

@@ -11,10 +11,6 @@ pub fn server_log_level() -> String {
     "error".to_string()
 }
 
-pub fn server_limit_open_files() -> u64 {
-    1024
-}
-
 pub fn channel_inet() -> SocketAddr {
     "[::1]:1491".parse().unwrap()
 }

src/main.rs

@@ -20,7 +20,6 @@ extern crate fst_levenshtein;
 extern crate fst_regex;
 extern crate graceful;
 extern crate hashbrown;
-extern crate libc;
 extern crate linked_hash_set;
 extern crate rand;
 extern crate regex_syntax;
@@ -42,7 +41,6 @@ mod stopwords;
 mod store;
 mod tasker;
 
-use std::io;
 use std::ops::Deref;
 use std::str::FromStr;
 use std::thread;
@@ -141,24 +139,6 @@ fn ensure_states() {
     let (_, _) = (APP_ARGS.deref(), APP_CONF.deref());
 }
 
-fn ensure_limits() {
-    // Raise file descriptor limit for the process to the maximum allowed by the system
-    // Notice: this is required for large Sonic servers to open many FST files at once
-    let limit = libc::rlimit {
-        rlim_cur: APP_CONF.server.limit_open_files,
-        rlim_max: APP_CONF.server.limit_open_files,
-    };
-
-    unsafe {
-        if libc::setrlimit(libc::RLIMIT_NOFILE, &limit) != 0 {
-            panic!(
-                "failed setting open files limit: {}",
-                io::Error::last_os_error()
-            );
-        }
-    }
-}
-
 fn main() {
     let _logger = ConfigLogger::init(
         LevelFilter::from_str(&APP_CONF.server.log_level).expect("invalid log level"),
@@ -168,9 +148,8 @@ fn main() {
 
     info!("starting up");
 
-    // Ensure all states & limits are bound
+    // Ensure all states are bound
     ensure_states();
-    ensure_limits();
 
     // Spawn tasker (background thread)
     thread::spawn(spawn_tasker);