From d60ccf64e178583c63b2c2ee1d8000676b3c66fc Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Wed, 4 Aug 2021 00:17:12 -0600
Subject: [PATCH] bump recommended maps/nofiles

---
 ci/setup-new-buildkite-agent/setup-buildkite.sh |  2 +-
 ci/setup-new-buildkite-agent/setup-limits.sh    |  2 +-
 docs/src/running-validator/validator-start.md   | 10 +++++-----
 sdk/docker-solana/README.md                     |  4 ++--
 sys-tuner/src/main.rs                           |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ci/setup-new-buildkite-agent/setup-buildkite.sh b/ci/setup-new-buildkite-agent/setup-buildkite.sh
index c3c6a33cb..b28110ccf 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=700000
+LimitNOFILE=1000000
 
 [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 cf0c0be27..7fc4d5ad7 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
-echo "* - nofile 700000" > /etc/security/limits.d/90-solana-nofiles.conf
+echo "* - nofile 1000000" > /etc/security/limits.d/90-solana-nofiles.conf
 
diff --git a/docs/src/running-validator/validator-start.md b/docs/src/running-validator/validator-start.md
index 20d4a892a..4bdbd466d 100644
--- a/docs/src/running-validator/validator-start.md
+++ b/docs/src/running-validator/validator-start.md
@@ -89,7 +89,7 @@ sudo sysctl -p /etc/sysctl.d/20-solana-udp-buffers.conf
 ```bash
 sudo bash -c "cat >/etc/sysctl.d/20-solana-mmaps.conf <<EOF
 # Increase memory mapped files limit
-vm.max_map_count = 700000
+vm.max_map_count = 1000000
 EOF"
 ```
 
@@ -100,14 +100,14 @@ sudo sysctl -p /etc/sysctl.d/20-solana-mmaps.conf
 Add
 
 ```
-LimitNOFILE=700000
+LimitNOFILE=1000000
 ```
 
 to the `[Service]` section of your systemd service file, if you use one,
 otherwise add
 
 ```
-DefaultLimitNOFILE=700000
+DefaultLimitNOFILE=1000000
 ```
 
 to the `[Manager]` section of `/etc/systemd/system.conf`.
@@ -119,7 +119,7 @@ sudo systemctl daemon-reload
 ```bash
 sudo bash -c "cat >/etc/security/limits.d/90-solana-nofiles.conf <<EOF
 # Increase process file descriptor count limit
-* - nofile 700000
+* - nofile 1000000
 EOF"
 ```
 
@@ -349,7 +349,7 @@ Type=simple
 Restart=always
 RestartSec=1
 User=sol
-LimitNOFILE=700000
+LimitNOFILE=1000000
 LogRateLimitIntervalSec=0
 Environment="PATH=/bin:/usr/bin:/home/sol/.local/share/solana/install/active_release/bin"
 ExecStart=/home/sol/bin/validator.sh
diff --git a/sdk/docker-solana/README.md b/sdk/docker-solana/README.md
index 591050699..8a8041ea1 100644
--- a/sdk/docker-solana/README.md
+++ b/sdk/docker-solana/README.md
@@ -6,12 +6,12 @@ https://hub.docker.com/r/solanalabs/solana/
 ### Usage:
 Run the latest beta image:
 ```bash
-$ docker run --rm -p 8899:8899 --ulimit nofile=700000 solanalabs/solana:beta
+$ docker run --rm -p 8899:8899 --ulimit nofile=1000000 solanalabs/solana:beta
 ```
 
 Run the latest edge image:
 ```bash
-$ docker run --rm -p 8899:8899 --ulimit nofile=700000 solanalabs/solana:edge
+$ docker run --rm -p 8899:8899 --ulimit nofile=1000000 solanalabs/solana:edge
 ```
 
 Port *8899* is the JSON RPC port, which is used by clients to communicate with the network.
diff --git a/sys-tuner/src/main.rs b/sys-tuner/src/main.rs
index a89997250..e00a64b43 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", "700000");
+    sysctl_write("vm.max_map_count", "1000000");
 }
 
 #[cfg(unix)]