diff options
author | gjoranv <gv@verizonmedia.com> | 2019-03-19 17:20:18 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-03-19 17:20:18 +0100 |
commit | ea26234e5da952ce6bd222797bd53c783918c145 (patch) | |
tree | 38d2c9e9346e759b32c41bc6252b43b46c5586a4 /config-model | |
parent | 3ecb6309e876747e84d26543feefc2c5ae1a458e (diff) |
Remove unnecessary use of 'isHostedVespa' in Containers.
Diffstat (limited to 'config-model')
4 files changed, 27 insertions, 23 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java index 943d353593d..3d8773dcc2a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java @@ -16,7 +16,7 @@ public class LogserverContainer extends Container { private final boolean useSeparateServiceTypeForLogserverContainer; public LogserverContainer(AbstractConfigProducer parent, boolean useSeparateServiceTypeForLogserverContainer) { - super(parent, "" + 0, 0, true); + super(parent, "" + 0, 0); this.useSeparateServiceTypeForLogserverContainer = useSeparateServiceTypeForLogserverContainer; } 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 00f1010542e..7c08f386e94 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 @@ -37,7 +37,7 @@ public class ClusterControllerContainer extends Container implements private final Set<String> bundles = new TreeSet<>(); public ClusterControllerContainer(AbstractConfigProducer parent, int index, boolean runStandaloneZooKeeper, boolean isHosted) { - super(parent, "" + index, index, isHosted); + super(parent, "" + index, index); this.index = index; addHandler( new Handler(new ComponentModel(new BundleInstantiationSpecification( 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 66362e2708e..b381168838f 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 @@ -11,12 +11,18 @@ import com.yahoo.config.model.producer.AbstractConfigProducer; */ public final class ApplicationContainer extends Container { + private static final String defaultHostedJVMArgs = "-XX:+UseOSErrorReporting -XX:+SuppressFatalErrorMessage"; + + private final boolean isHostedVespa; + + public ApplicationContainer(AbstractConfigProducer parent, String name, int index, boolean isHostedVespa) { - super(parent, name, index, isHostedVespa); + this(parent, name, false, index, isHostedVespa); } public ApplicationContainer(AbstractConfigProducer parent, String name, boolean retired, int index, boolean isHostedVespa) { - super(parent, name, retired, index, isHostedVespa); + super(parent, name, retired, index); + this.isHostedVespa = isHostedVespa; } @Override @@ -31,4 +37,17 @@ public final class ApplicationContainer extends Container { return ContainerServiceType.CONTAINER; } + /** Returns the jvm arguments this should start with */ + @Override + public String getJvmOptions() { + String jvmArgs = super.getJvmOptions(); + return isHostedVespa && hasDocproc() + ? ("".equals(jvmArgs) ? defaultHostedJVMArgs : defaultHostedJVMArgs + " " + jvmArgs) + : jvmArgs; + } + + private boolean hasDocproc() { + return (parent instanceof ContainerCluster) && (((ContainerCluster)parent).getDocproc() != null); + } + } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java index 007c595b843..8e0a06ad69c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java @@ -54,7 +54,6 @@ public abstract class Container extends AbstractService implements protected final AbstractConfigProducer parent; private final String name; - private final boolean isHostedVespa; private boolean requireSpecificPorts = true; private String clusterName = null; @@ -72,16 +71,15 @@ public abstract class Container extends AbstractService implements private final int numHttpServerPorts; private static final int numRpcServerPorts = 2; - private static final String defaultHostedJVMArgs = "-XX:+UseOSErrorReporting -XX:+SuppressFatalErrorMessage"; - public Container(AbstractConfigProducer parent, String name, int index, boolean isHostedVespa) { - this(parent, name, false, index, isHostedVespa); + protected Container(AbstractConfigProducer parent, String name, int index) { + this(parent, name, false, index); } - public Container(AbstractConfigProducer parent, String name, boolean retired, int index, boolean isHostedVespa) { + + protected Container(AbstractConfigProducer parent, String name, boolean retired, int index) { super(parent, name); this.name = name; this.parent = parent; - this.isHostedVespa = isHostedVespa; this.retired = retired; this.index = index; @@ -187,10 +185,6 @@ public abstract class Container extends AbstractService implements defaultHttpServer.addConnector(new ConnectorFactory("SearchServer", getSearchPort())); } - private boolean hasDocproc() { - return (parent instanceof ContainerCluster) && (((ContainerCluster)parent).getDocproc() != null); - } - private ContainerServiceType myServiceType = null; /** Subclasses must implement {@link #myServiceType()} for a custom service name. */ @@ -321,15 +315,6 @@ public abstract class Container extends AbstractService implements } } - /** Returns the jvm arguments this should start with */ - @Override - public String getJvmOptions() { - String jvmArgs = super.getJvmOptions(); - return isHostedVespa && hasDocproc() - ? ("".equals(jvmArgs) ? defaultHostedJVMArgs : defaultHostedJVMArgs + " " + jvmArgs) - : jvmArgs; - } - /** Returns the jvm args set explicitly for this node */ public String getAssignedJvmOptions() { return super.getJvmOptions(); } |