Add feature flag that can be used to disable OmitStackTraceInFastThrow JVM option

1 files changed, 8 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index f1717625d10..60991a59a75 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -3,9 +3,11 @@ package com.yahoo.vespa.model.admin.clustercontroller;
 
 import com.yahoo.cloud.config.ZookeeperServerConfig;
 import com.yahoo.component.ComponentSpecification;
+import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
+import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.container.core.documentapi.DocumentAccessProvider;
 import com.yahoo.container.di.config.PlatformBundlesConfig;
@@ -46,7 +48,7 @@ public class ClusterControllerContainer extends Container implements
                                       boolean runStandaloneZooKeeper,
                                       DeployState deployState,
                                       boolean retired) {
-        super(parent, "" + index, retired, index, deployState.isHosted());
+        super(parent, "" + index, retired, index, deployState);
         addHandler("clustercontroller-status",
                    "com.yahoo.vespa.clustercontroller.apps.clustercontroller.StatusHandler",
                    "/clustercontroller-status/*",
@@ -84,6 +86,11 @@ public class ClusterControllerContainer extends Container implements
         return ContainerServiceType.CLUSTERCONTROLLER_CONTAINER;
     }
 
+    @Override
+    protected String jvmOmitStackTraceInFastThrowOption(ModelContext.FeatureFlags featureFlags) {
+        return featureFlags.jvmOmitStackTraceInFastThrowOption(ClusterSpec.Type.admin);
+    }
+
     private void configureZooKeeperServer(boolean runStandaloneZooKeeper) {
         if (runStandaloneZooKeeper)
             ContainerModelBuilder.addReconfigurableZooKeeperServerComponents(this);