diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-02-24 17:34:06 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-02-24 17:34:06 +0100 |
commit | 54e094035634352a2414e47c84c506ecb7588ad3 (patch) | |
tree | 65d0901131f67be1a499da61cbb2203cc2480ad0 /node-admin | |
parent | 72bee965a485d420efc159e7eea0b9e29a455b55 (diff) |
Add inet6 dns option to container
Diffstat (limited to 'node-admin')
2 files changed, 8 insertions, 0 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 c790e73037e..782f8592350 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 @@ -66,6 +66,9 @@ public class DockerOperationsImpl implements DockerOperations { .withHostName(context.node().hostname()) .withResources(containerResources) .withManagedBy(MANAGER_NAME) + // The inet6 option is needed to prefer AAAA records with gethostbyname(3), used by (at least) a yca package + // TODO: Try to remove this + .withDnsOption("inet6") .withUlimit("nofile", 262_144, 262_144) // The nproc aka RLIMIT_NPROC resource limit works as follows: // - A process has a (soft) nproc limit, either inherited by the parent or changed with setrlimit(2). diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java index e2ad9e3de97..69bc9f5e092 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java @@ -181,6 +181,11 @@ public class DockerMock implements Docker { } @Override + public CreateContainerCommand withDnsOption(String dnsOption) { + return this; + } + + @Override public CreateContainerCommand withPrivileged(boolean privileged) { return this; } |