summaryrefslogtreecommitdiffstats
path: root/node-admin/src
diff options
context:
space:
mode:
authorvalerijf <valerijf@yahoo-inc.com>2017-03-15 12:35:58 +0100
committervalerijf <valerijf@yahoo-inc.com>2017-03-15 12:35:58 +0100
commit3023d8e236646b3ab5250086cf62cc306e125477 (patch)
tree5b5bbad03df2e532a0dab0b748de2db04abecb25 /node-admin/src
parenta563306957b180c933e5e2ff68a989b32f02aae7 (diff)
Update ulimits
Diffstat (limited to 'node-admin/src')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java4
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
index 99da09ca71b..2d30a56a5dc 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
@@ -152,8 +152,8 @@ public class DockerOperationsImpl implements DockerOperations {
.withNetworkMode(DockerImpl.DOCKER_CUSTOM_MACVLAN_NETWORK_NAME)
.withIpAddress(nodeInetAddress)
.withEnvironment("CONFIG_SERVER_ADDRESS", configServers)
- .withUlimit("nofile", 16384, 16384)
- .withUlimit("nproc", 409600, 409600)
+ .withUlimit("nofile", 262_144, 262_144)
+ .withUlimit("nproc", 32_768, 409_600)
.withUlimit("core", -1, -1)
.withAddCapability("SYS_PTRACE"); // Needed for gcore, pstack etc.
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
index 6269ceb2fc9..80e0b23b55b 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
@@ -71,8 +71,8 @@ public class LocalZoneUtils {
.withEnvironment("HOSTED_VESPA_REGION", environment.getRegion())
.withEnvironment("CONFIG_SERVER_HOSTNAME", CONFIG_SERVER_HOSTNAME)
.withEntrypoint(Defaults.getDefaults().underVespaHome("bin/start-config-server.sh"))
- .withUlimit("nofile", 16384, 16384)
- .withUlimit("nproc", 409600, 409600)
+ .withUlimit("nofile", 262_144, 262_144)
+ .withUlimit("nproc", 32_768, 409_600)
.withUlimit("core", -1, -1)
.create();