Do not use vespamalloc for metrics-proxy. It is pure java.

3 files changed, 20 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index e75a9f2b125..04660f2b990 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -53,7 +53,7 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
 
     /** The optional PRELOAD libraries for this Service. */
     // Please keep non-null, as passed to command line in service startup
-    private String preload = Defaults.getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so");
+    private String preload = null;
 
     // If larger or equal to 0 it mean that explicit mmaps shall not be included in coredump.
     private long mmapNoCoreLimit = -1L;
@@ -84,6 +84,10 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
 
     private boolean initialized = false;
 
+    protected String defaultPreload() {
+        return Defaults.getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so");
+    }
+
     /**
      * Preferred constructor when building from XML. Use this if you are building
      * in doBuild() in an AbstractConfigProducerBuilder.
@@ -365,7 +369,9 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
             setJvmOptions(args + getSeparator(jvmOptions) + jvmOptions);
         }
     }
-    public String getPreLoad() { return preload; }
+    public String getPreLoad() {
+        return preload != null ? preload : defaultPreload();
+    }
     public void setPreLoad(String preload) {
         this.preload = preload;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
index fd20bc1d12e..f7a4f2e52a2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
@@ -144,4 +144,8 @@ public class MetricsProxyContainer extends Container implements
         addSimpleComponent(componentClass.getName(), null, METRICS_PROXY_BUNDLE_NAME);
     }
 
+    @Override
+    protected String defaultPreload() {
+        return "";
+    }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
index eddad6fce89..b3ace3ef8de 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
@@ -87,6 +87,14 @@ public class MetricsProxyContainerTest {
     }
 
     @Test
+    public void preload_is_empty() {
+        VespaModel model = getModel(servicesWithContent(), self_hosted);
+        MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
+
+        assertEquals("", container.getPreLoad());
+    }
+
+    @Test
     public void hosted_application_propagates_node_dimensions() {
         String services = servicesWithContent();
         VespaModel hostedModel = getModel(services, hosted);