From 11951eb0099a7a1b4727e5204ae9d443c19484e7 Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Mon, 17 Aug 2020 22:40:54 -0600
Subject: [PATCH] Sync FD limit and max maps to 500k

---
 ci/setup-new-buildkite-agent/setup-buildkite.sh | 2 +-
 ci/setup-new-buildkite-agent/setup-limits.sh    | 2 +-
 ledger/src/blockstore.rs                        | 2 +-
 sys-tuner/src/main.rs                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/setup-new-buildkite-agent/setup-buildkite.sh b/ci/setup-new-buildkite-agent/setup-buildkite.sh
index 5387762eb..499d1f023 100755
--- a/ci/setup-new-buildkite-agent/setup-buildkite.sh
+++ b/ci/setup-new-buildkite-agent/setup-buildkite.sh
@@ -76,7 +76,7 @@ RestartForceExitStatus=SIGPIPE
 TimeoutStartSec=10
 TimeoutStopSec=0
 KillMode=process
-LimitNOFILE=65536
+LimitNOFILE=500000
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ci/setup-new-buildkite-agent/setup-limits.sh b/ci/setup-new-buildkite-agent/setup-limits.sh
index 841ab8410..140c26a3a 100755
--- a/ci/setup-new-buildkite-agent/setup-limits.sh
+++ b/ci/setup-new-buildkite-agent/setup-limits.sh
@@ -8,5 +8,5 @@ source "$HERE"/utils.sh
 ensure_env || exit 1
 
 # Allow more files to be opened by a user
-sed -i 's/^\(# End of file\)/* soft nofile 65535\n\n\1/' /etc/security/limits.conf
+echo "* - nofile 500000" > /etc/security/limits.d/90-solana-nofiles.conf
 
diff --git a/ledger/src/blockstore.rs b/ledger/src/blockstore.rs
index 118d403f0..a9aa4abcf 100644
--- a/ledger/src/blockstore.rs
+++ b/ledger/src/blockstore.rs
@@ -3257,7 +3257,7 @@ fn adjust_ulimit_nofile() -> Result<()> {
 fn adjust_ulimit_nofile() -> Result<()> {
     // Rocks DB likes to have many open files.  The default open file descriptor limit is
     // usually not enough
-    let desired_nofile = 65000;
+    let desired_nofile = 500000;
 
     fn get_nofile() -> libc::rlimit {
         let mut nofile = libc::rlimit {
diff --git a/sys-tuner/src/main.rs b/sys-tuner/src/main.rs
index aa00bd7cd..45f6f59af 100644
--- a/sys-tuner/src/main.rs
+++ b/sys-tuner/src/main.rs
@@ -93,7 +93,7 @@ fn tune_kernel_udp_buffers_and_vmmap() {
     sysctl_write("net.core.wmem_default", "134217728");
 
     // increase mmap counts for many append_vecs
-    sysctl_write("vm.max_map_count", "1000000");
+    sysctl_write("vm.max_map_count", "500000");
 }
 
 #[cfg(unix)]