Use VESPA_TOTAL_MEMORY_MB when starting container

1 files changed, 4 insertions, 2 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 d49b5ee40c7..0ae807f7f04 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
@@ -171,10 +171,12 @@ public class DockerOperationsImpl implements DockerOperations {
                 long minMainMemoryAvailableMb = (long) (nodeSpec.minMainMemoryAvailableGb.get() * 1024);
                 if (minMainMemoryAvailableMb > 0) {
                     command.withMemoryInMb(minMainMemoryAvailableMb);
-                    // TOTAL_MEMORY_MB is used to make any jdisc container think the machine
+                    // VESPA_TOTAL_MEMORY_MB is used to make any jdisc container think the machine
                     // only has this much physical memory (overrides total memory reported by `free -m`).
-                    command.withEnvironment("TOTAL_MEMORY_MB", Long.toString(minMainMemoryAvailableMb));
                     command.withEnvironment("VESPA_TOTAL_MEMORY_MB", Long.toString(minMainMemoryAvailableMb));
+
+                    // TODO: Remove once the lowest version in prod is 6.95
+                    command.withEnvironment("TOTAL_MEMORY_MB", Long.toString(minMainMemoryAvailableMb));
                 }
             }