Drop SuppressFatalErrorMessage

2 files changed, 7 insertions, 24 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
index 64608e3adea..1971ccc3035 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
@@ -24,8 +24,6 @@ public final class ApplicationContainer extends Container implements
         QrStartConfig.Producer,
         ZookeeperServerConfig.Producer {
 
-    private static final String defaultHostedJVMArgs = "-XX:+SuppressFatalErrorMessage";
-
     private final boolean isHostedVespa;
 
     public ApplicationContainer(AbstractConfigProducer<?> parent, String name, int index, DeployState deployState) {
@@ -64,9 +62,6 @@ public final class ApplicationContainer extends Container implements
     public String getJvmOptions() {
         StringBuilder b = new StringBuilder();
         if (isHostedVespa) {
-            if (hasDocproc()) {
-                b.append(ApplicationContainer.defaultHostedJVMArgs).append(' ');
-            }
             b.append("-Djdk.tls.server.enableStatusRequestExtension=true ")
                     .append("-Djdk.tls.stapling.responseTimeout=2000 ")
                     .append("-Djdk.tls.stapling.cacheSize=256 ")
@@ -79,10 +74,6 @@ public final class ApplicationContainer extends Container implements
         return b.toString().trim();
     }
 
-    private boolean hasDocproc() {
-        return (parent instanceof ContainerCluster) && (((ContainerCluster<?>)parent).getDocproc() != null);
-    }
-
     @Override
     public void getConfig(ZookeeperServerConfig.Builder builder) {
         builder.myid(index());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index 9a2f8a3f0ec..23b576be8b3 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -143,16 +143,8 @@ public class ContainerClusterTest {
         verifyHeapSizeAsPercentageOfPhysicalMemory(createRoot(!hosted, heapSizeInFlag), !combined, 69, 69);
     }
 
-    private void verifyJvmArgs(boolean isHosted, boolean hasDocproc, String expectedArgs, String jvmArgs) {
-        if (isHosted && hasDocproc) {
-            String defaultHostedJVMArgs = "-XX:+SuppressFatalErrorMessage";
-            if ( ! "".equals(expectedArgs)) {
-                defaultHostedJVMArgs = defaultHostedJVMArgs + " ";
-            }
-            assertEquals(defaultHostedJVMArgs + expectedArgs, jvmArgs);
-        } else {
-            assertEquals(expectedArgs, jvmArgs);
-        }
+    private void verifyJvmArgs(boolean isHosted, String expectedArgs, String jvmArgs) {
+        assertEquals(expectedJvmArgs(isHosted, expectedArgs), jvmArgs);
     }
 
     private void verifyJvmArgs(boolean isHosted, boolean hasDocProc) {
@@ -164,15 +156,15 @@ public class ContainerClusterTest {
         addContainer(root, cluster, "c1", "host-c1");
         assertEquals(1, cluster.getContainers().size());
         ApplicationContainer container = cluster.getContainers().get(0);
-        verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, ""), container.getJvmOptions());
+        verifyJvmArgs(isHosted, "", container.getJvmOptions());
         container.setJvmOptions("initial");
-        verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "initial"), container.getJvmOptions());
+        verifyJvmArgs(isHosted, "initial", container.getJvmOptions());
         container.prependJvmOptions("ignored");
-        verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "ignored initial"), container.getJvmOptions());
+        verifyJvmArgs(isHosted,  "ignored initial", container.getJvmOptions());
         container.appendJvmOptions("override");
-        verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "ignored initial override"), container.getJvmOptions());
+        verifyJvmArgs(isHosted, "ignored initial override", container.getJvmOptions());
         container.setJvmOptions(null);
-        verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, ""), container.getJvmOptions());
+        verifyJvmArgs(isHosted,  "", container.getJvmOptions());
     }
 
     @Test