diff options
| author | hakonhall <hakon@yahoo-inc.com> | 2017-03-15 14:03:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 14:03:48 +0100 |
| commit | f97f1f8d65c53128a98a497a8e3299d6b4abc41f (patch) | |
| tree | 7cf3850dc7f16c77da8a4aa6afc7dd9122329175 /node-admin | |
| parent | ac44d2e8e7702de5c50bd7fd1e5ceba7e46c83e9 (diff) | |
| parent | 3023d8e236646b3ab5250086cf62cc306e125477 (diff) | |
Merge pull request #2009 from yahoo/freva/update-ulimits
Update ulimits
Diffstat (limited to 'node-admin')
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 4 | ||||
| -rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java | 4 |
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(); |