diff options
10 files changed, 17 insertions, 274 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java index c2394e7cac3..58f03bffb30 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java @@ -6,7 +6,6 @@ import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.component.Handler; -import com.yahoo.vespaclient.config.FeederConfig; import java.util.Collection; import java.util.Collections; @@ -14,9 +13,9 @@ import java.util.Collections; /** * @author Einar M R Rosenvinge */ -public class ContainerDocumentApi implements FeederConfig.Producer { +public class ContainerDocumentApi { - public static final String vespaClientBundleSpecification = "vespaclient-container-plugin"; + private static final String vespaClientBundleSpecification = "vespaclient-container-plugin"; private final Options options; public ContainerDocumentApi(ContainerCluster cluster, Options options) { @@ -29,7 +28,7 @@ public class ContainerDocumentApi implements FeederConfig.Producer { cluster.addComponent(newVespaClientHandler("com.yahoo.vespa.http.server.FeedHandler", ContainerCluster.RESERVED_URI_PREFIX + "/feedapi")); } - private Handler newVespaClientHandler(String componentId, String bindingSuffix) { + private Handler<AbstractConfigProducer<?>> newVespaClientHandler(String componentId, String bindingSuffix) { Handler<AbstractConfigProducer<?>> handler = new Handler<>(new ComponentModel( BundleInstantiationSpecification.getFromStrings(componentId, null, vespaClientBundleSpecification), "")); @@ -40,66 +39,12 @@ public class ContainerDocumentApi implements FeederConfig.Producer { return handler; } - @Override - public void getConfig(FeederConfig.Builder builder) { - if (options.abortondocumenterror != null) - builder.abortondocumenterror(options.abortondocumenterror); - if (options.route!= null) - builder.route(options.route); - if (options.maxpendingdocs != null) - builder.maxpendingdocs(options.maxpendingdocs); - if (options.maxpendingbytes != null) - builder.maxpendingbytes(options.maxpendingbytes); - if (options.retryenabled != null) - builder.retryenabled(options.retryenabled); - if (options.retrydelay != null) - builder.retrydelay(options.retrydelay); - if (options.timeout != null) - builder.timeout(options.timeout); - if (options.tracelevel != null) - builder.tracelevel(options.tracelevel); - if (options.mbusport != null) - builder.mbusport(options.mbusport); - if (options.docprocChain != null) - builder.docprocchain(options.docprocChain); - } - public static final class Options { private final Collection<String> bindings; - private final Boolean abortondocumenterror; - private final String route; - private final Integer maxpendingdocs; - private final Integer maxpendingbytes; - private final Boolean retryenabled; - private final Double retrydelay; - private final Double timeout; - private final Integer tracelevel; - private final Integer mbusport; - private final String docprocChain; - public Options(Collection<String> bindings, - Boolean abortondocumenterror, - String route, - Integer maxpendingdocs, - Integer maxpendingbytes, - Boolean retryenabled, - Double retrydelay, - Double timeout, - Integer tracelevel, - Integer mbusport, - String docprocChain) { + public Options(Collection<String> bindings) { this.bindings = Collections.unmodifiableCollection(bindings); - this.abortondocumenterror = abortondocumenterror; - this.route = route; - this.maxpendingdocs = maxpendingdocs; - this.maxpendingbytes = maxpendingbytes; - this.retryenabled = retryenabled; - this.retrydelay = retrydelay; - this.timeout = timeout; - this.tracelevel = tracelevel; - this.mbusport = mbusport; - this.docprocChain = docprocChain; } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 446169c0ed2..ad087288799 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -58,7 +58,6 @@ import com.yahoo.vespa.model.container.search.ContainerSearch; import com.yahoo.vespa.model.container.search.searchchain.SearchChains; import com.yahoo.vespa.model.content.Content; import com.yahoo.vespa.model.search.AbstractSearchCluster; -import com.yahoo.vespaclient.config.FeederConfig; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; @@ -93,7 +92,6 @@ public abstract class ContainerCluster<CONTAINER extends Container> HealthMonitorConfig.Producer, ApplicationMetadataConfig.Producer, BundlesConfig.Producer, - FeederConfig.Producer, IndexInfoConfig.Producer, IlscriptsConfig.Producer, SchemamappingConfig.Producer, @@ -557,11 +555,6 @@ public abstract class ContainerCluster<CONTAINER extends Container> } @Override - public void getConfig(FeederConfig.Builder builder) { - if (containerDocumentApi != null) containerDocumentApi.getConfig(builder); - } - - @Override public void getConfig(ContainerMbusConfig.Builder builder) { if (mbusParams != null) { if (mbusParams.maxConcurrentFactor != null) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java index 10e24a609f7..ae74dbdb4a7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java @@ -21,18 +21,7 @@ public class DocumentApiOptionsBuilder { private static final String[] DEFAULT_BINDINGS = {"http://*/"}; public static ContainerDocumentApi.Options build(Element spec) { - return new ContainerDocumentApi.Options( - getBindings(spec), - getAbortOnDocumentError(spec), - getRoute(spec), - getMaxPendingDocs(spec), - getMaxPendingBytes(spec), - getRetryEnabled(spec), - getRetryDelay(spec), - getTimeout(spec), - getTracelevel(spec), - getMbusPort(spec), - getDocprocChain(spec)); + return new ContainerDocumentApi.Options(getBindings(spec)); } private static List<String> getBindings(Element spec) { @@ -57,65 +46,4 @@ public class DocumentApiOptionsBuilder { return binding; } - private static String getCleanValue(Element spec, String name) { - Element elem = XML.getChild(spec, name); - if (elem == null) { - return null; - } - String value = elem.getFirstChild().getNodeValue(); - if (value == null) { - return null; - } - value = value.trim(); - return value.isEmpty() ? null : value; - } - - private static String getDocprocChain(Element spec) { - return getCleanValue(spec, "docprocchain"); - } - - private static Integer getMbusPort(Element spec) { - String value = getCleanValue(spec, "mbusport"); - return value == null ? null : Integer.parseInt(value); - } - - private static Integer getTracelevel(Element spec) { - String value = getCleanValue(spec, "tracelevel"); - return value == null ? null : Integer.parseInt(value); - } - - private static Double getTimeout(Element spec) { - String value = getCleanValue(spec, "timeout"); - return value == null ? null : Double.parseDouble(value); - } - - private static Double getRetryDelay(Element spec) { - String value = getCleanValue(spec, "retrydelay"); - return value == null ? null : Double.parseDouble(value); - } - - private static Boolean getRetryEnabled(Element spec) { - String value = getCleanValue(spec, "retryenabled"); - return value == null ? null : Boolean.parseBoolean(value); - } - - private static Integer getMaxPendingBytes(Element spec) { - String value = getCleanValue(spec, "maxpendingbytes"); - return value == null ? null : Integer.parseInt(value); - } - - private static Integer getMaxPendingDocs(Element spec) { - String value = getCleanValue(spec, "maxpendingdocs"); - return value == null ? null : Integer.parseInt(value); - } - - private static String getRoute(Element spec) { - return getCleanValue(spec, "route"); - } - - private static Boolean getAbortOnDocumentError(Element spec) { - String value = getCleanValue(spec, "abortondocumenterror"); - return value == null ? null : Boolean.parseBoolean(value); - } - } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java index 5b92934678d..7e5106b1a71 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.model.container.xml; import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.component.Handler; -import com.yahoo.vespaclient.config.FeederConfig; import org.junit.Test; import org.w3c.dom.Element; @@ -36,29 +35,6 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa } @Test - public void document_api_config_is_added_to_container_cluster() { - Element elem = DomBuilderTest.parse( - "<jdisc id='cluster1' version='1.0'>", - " <document-api>", - " <abortondocumenterror>false</abortondocumenterror>", - " <maxpendingdocs>4321</maxpendingdocs>", - " <retrydelay>12.34</retrydelay>", - " <route>non-default</route>", - " </document-api>", - nodesXml, - "</jdisc>"); - createModel(root, elem); - ContainerCluster cluster = (ContainerCluster)root.getProducer("cluster1"); - FeederConfig.Builder builder = new FeederConfig.Builder(); - cluster.getDocumentApi().getConfig(builder); - FeederConfig config = new FeederConfig(builder); - assertThat(config.abortondocumenterror(), is(false)); - assertThat(config.maxpendingdocs(), is(4321)); - assertThat(config.retrydelay(), is(12.34)); - assertThat(config.route(), is("non-default")); - } - - @Test public void custom_bindings_are_allowed() { Element elem = DomBuilderTest.parse( "<jdisc id='cluster1' version='1.0'>", diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java index 952f87cbc6d..96fee482092 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java @@ -330,7 +330,6 @@ public class TenantRequestHandlerTest { configNames = server.listConfigs(ApplicationId.defaultId(), Optional.of(vespaVersion), true); System.out.println(configNames); - assertTrue(configNames.contains(new ConfigKey<>("feeder", "jdisc", "vespaclient.config"))); assertTrue(configNames.contains(new ConfigKey<>("documentmanager", "jdisc", "document.config"))); assertTrue(configNames.contains(new ConfigKey<>("documentmanager", "", "document.config"))); assertTrue(configNames.contains(new ConfigKey<>("documenttypes", "", "document"))); diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/FeederOptions.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/FeederOptions.java index ecfd3c9eded..25ef7651e28 100755 --- a/vespaclient-core/src/main/java/com/yahoo/feedapi/FeederOptions.java +++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/FeederOptions.java @@ -22,14 +22,12 @@ public class FeederOptions { private boolean abortOnSendError = true; private boolean retryEnabled = true; private double timeout = 60; - private int maxPendingBytes = 0; private int maxPendingDocs = 0; private double maxFeedRate = 0.0; private String route = "default"; private int traceLevel; private int mbusPort; private DocumentProtocol.Priority priority = DocumentProtocol.Priority.NORMAL_3; - private String docprocChain = ""; /** Constructs an options object with all default values. */ FeederOptions() { @@ -40,14 +38,12 @@ public class FeederOptions { FeederOptions(FeederConfig config) { setAbortOnDocumentError(config.abortondocumenterror()); setAbortOnSendError(config.abortonsenderror()); - setMaxPendingBytes(config.maxpendingbytes()); setMaxPendingDocs(config.maxpendingdocs()); setRetryEnabled(config.retryenabled()); setRoute(config.route()); setTimeout(config.timeout()); setTraceLevel(config.tracelevel()); setMessageBusPort(config.mbusport()); - setDocprocChain(config.docprocchain()); setMaxFeedRate(config.maxfeedrate()); } @@ -71,10 +67,6 @@ public class FeederOptions { this.timeout = timeout; } - private void setMaxPendingBytes(int maxPendingBytes) { - this.maxPendingBytes = maxPendingBytes; - } - private void setMaxPendingDocs(int maxPendingDocs) { this.maxPendingDocs = maxPendingDocs; } @@ -123,14 +115,6 @@ public class FeederOptions { this.priority = priority; } - String getDocprocChain() { - return docprocChain; - } - - private void setDocprocChain(String chain) { - docprocChain = chain; - } - /** * Creates a source session params object with parameters set as these options * dictate. @@ -141,7 +125,7 @@ public class FeederOptions { StaticThrottlePolicy policy; if (maxFeedRate > 0.0) { policy = new RateThrottlingPolicy(maxFeedRate); - } else if ((maxPendingDocs == 0) && (maxPendingBytes == 0)) { + } else if (maxPendingDocs == 0) { policy = new DynamicThrottlePolicy(); } else { policy = new StaticThrottlePolicy(); @@ -149,9 +133,6 @@ public class FeederOptions { if (maxPendingDocs > 0) { policy.setMaxPendingCount(maxPendingDocs); } - if (maxPendingBytes > 0) { - policy.setMaxPendingSize(maxPendingBytes); - } params.setThrottlePolicy(policy); @@ -179,13 +160,11 @@ public class FeederOptions { ", abortOnSendError=" + abortOnSendError + ", retryEnabled=" + retryEnabled + ", timeout=" + timeout + - ", maxPendingBytes=" + maxPendingBytes + ", maxPendingDocs=" + maxPendingDocs + ", route='" + route + '\'' + ", traceLevel=" + traceLevel + ", mbusPort=" + mbusPort + ", priority=" + priority.name() + - ", docprocChain='" + docprocChain + '\'' + '}'; } @@ -198,14 +177,12 @@ public class FeederOptions { if (abortOnDocumentError != that.abortOnDocumentError) return false; if (abortOnSendError != that.abortOnSendError) return false; - if (maxPendingBytes != that.maxPendingBytes) return false; if (maxPendingDocs != that.maxPendingDocs) return false; if (maxFeedRate != that.maxFeedRate) return false; if (mbusPort != that.mbusPort) return false; if (retryEnabled != that.retryEnabled) return false; if (Double.compare(that.timeout, timeout) != 0) return false; if (traceLevel != that.traceLevel) return false; - if (docprocChain != null ? !docprocChain.equals(that.docprocChain) : that.docprocChain != null) return false; if (priority != that.priority) return false; if (route != null ? !route.equals(that.route) : that.route != null) return false; @@ -221,14 +198,12 @@ public class FeederOptions { result = 31 * result + (retryEnabled ? 1 : 0); temp = timeout != +0.0d ? Double.doubleToLongBits(timeout) : 0L; result = 31 * result + (int) (temp ^ (temp >>> 32)); - result = 31 * result + maxPendingBytes; result = 31 * result + maxPendingDocs; result = 31 * result + ((int)(maxFeedRate * 1000)); result = 31 * result + (route != null ? route.hashCode() : 0); result = 31 * result + traceLevel; result = 31 * result + mbusPort; result = 31 * result + (priority != null ? priority.hashCode() : 0); - result = 31 * result + (docprocChain != null ? docprocChain.hashCode() : 0); return result; } } diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java index 11688ba62e4..74a4f916c07 100644 --- a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java +++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java @@ -1,20 +1,15 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.feedapi; -import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.concurrent.SystemTimer; import com.yahoo.config.subscription.ConfigSubscriber; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.vespa.config.content.LoadTypeConfig; -import com.yahoo.container.Container; -import com.yahoo.docproc.DocprocService; -import com.yahoo.docproc.jdisc.DocumentProcessingHandler; import com.yahoo.documentapi.VisitorParameters; import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentMessage; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; -import com.yahoo.jdisc.handler.RequestHandler; import com.yahoo.log.LogLevel; import com.yahoo.messagebus.Message; import com.yahoo.messagebus.routing.Route; @@ -29,6 +24,8 @@ import java.util.logging.Logger; public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscriber<FeederConfig> { private static final Logger log = Logger.getLogger(MessagePropertyProcessor.class.getName()); + private static final boolean defaultCreateIfNonExistent = false; + private FeederOptions feederOptions = null; private Route defaultRoute = null; private long defaultTimeoutMillis = 0; @@ -36,8 +33,7 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib private String defaultDocprocChain = null; private boolean defaultAbortOnDocumentError = true; private boolean defaultAbortOnSendError = true; - private boolean defaultCreateIfNonExistent = false; - private LoadTypeSet loadTypes = null; + private final LoadTypeSet loadTypes; private boolean configChanged = false; @@ -50,50 +46,6 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib defaultRoute = Route.parse(routeOverride); } - private synchronized String getDocprocChainParameter(HttpRequest request) { - String docprocChainParam = request.getProperty("docprocchain"); - return (docprocChainParam == null ? defaultDocprocChain : docprocChainParam); - } - - public synchronized DocprocService getDocprocChain(HttpRequest request) { - ComponentRegistry<DocprocService> services = getDocprocServiceRegistry(request); - - String docprocChain = getDocprocChainParameter(request); - if (docprocChain == null) { - return null; - } - - return services.getComponent(docprocChain); - } - - public synchronized ComponentRegistry<DocprocService> getDocprocServiceRegistry(HttpRequest request) { - String docprocChain = getDocprocChainParameter(request); - if (docprocChain == null) { - return null; - } - - Container container = Container.get(); - if (container == null) { - throw new IllegalStateException("Could not get Container instance."); - } - - ComponentRegistry<RequestHandler> requestHandlerRegistry = container.getRequestHandlerRegistry(); - if (requestHandlerRegistry == null) { - throw new IllegalStateException("Could not get requesthandlerregistry."); - } - - DocumentProcessingHandler handler = (DocumentProcessingHandler) requestHandlerRegistry - .getComponent(DocumentProcessingHandler.class.getName()); - if (handler == null) { - return null; - } - ComponentRegistry<DocprocService> services = handler.getDocprocServiceRegistry(); - if (services == null) { - throw new IllegalStateException("Could not get DocprocServiceRegistry."); - } - return services; - } - public PropertySetter buildPropertySetter(HttpRequest request) { String routeParam = null; double timeoutParam = -1; @@ -163,15 +115,15 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib public long getDefaultTimeoutMillis() { return defaultTimeoutMillis; } - public synchronized boolean configChanged() { + synchronized boolean configChanged() { return configChanged; } - public synchronized void setConfigChanged(boolean configChanged) { + synchronized void setConfigChanged(boolean configChanged) { this.configChanged = configChanged; } - public synchronized FeederOptions getFeederOptions() { + synchronized FeederOptions getFeederOptions() { return feederOptions; } @@ -180,7 +132,7 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib configure(config); } - public LoadTypeSet getLoadTypes() { + LoadTypeSet getLoadTypes() { return loadTypes; } @@ -200,12 +152,6 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib defaultAbortOnDocumentError = feederOptions.abortOnDocumentError(); defaultAbortOnSendError = feederOptions.abortOnSendError(); - if (!"".equals(feederOptions.getDocprocChain())) { - defaultDocprocChain = feederOptions.getDocprocChain(); - } else { - defaultDocprocChain = null; - } - if (log.isLoggable(LogLevel.DEBUG)) { log.log(LogLevel.DEBUG, "Received new config (" + "route: " + (defaultRoute != null ? defaultRoute : "<none>") + @@ -232,9 +178,9 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib private LoadType loadType; private int traceLevel; - public PropertySetter(Route route, long timeout, long totalTimeout, DocumentProtocol.Priority priority, LoadType loadType, - boolean retryEnabled, boolean abortOnDocumentError, boolean abortOnFeedError, - boolean createIfNonExistent, int traceLevel) { + PropertySetter(Route route, long timeout, long totalTimeout, DocumentProtocol.Priority priority, LoadType loadType, + boolean retryEnabled, boolean abortOnDocumentError, boolean abortOnFeedError, + boolean createIfNonExistent, int traceLevel) { this.route = route; this.timeout = timeout; this.totalTimeout = totalTimeout; diff --git a/vespaclient-core/src/main/resources/configdefinitions/feeder.def b/vespaclient-core/src/main/resources/configdefinitions/feeder.def index a376a4807a7..9462943ce03 100644 --- a/vespaclient-core/src/main/resources/configdefinitions/feeder.def +++ b/vespaclient-core/src/main/resources/configdefinitions/feeder.def @@ -14,12 +14,6 @@ idprefix string default="" ## Max number of pending operations. maxpendingdocs int default=0 -## Max number of bytes in pending operations. -maxpendingbytes int default=0 - -## Max number of busy threads -maxbusythreads int default=150 - ## Max number of operations to perform per second (0 == no max) maxfeedrate double default=0.0 @@ -41,8 +35,5 @@ tracelevel int default=0 ## Messagebus port to start source session on mbusport int default=-1 -## Default docproc chain to run -docprocchain string default="" - ## Whether or not to set create-if-non-existent flag on all document updates handled by a feeder. createifnonexistent bool default=false diff --git a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java index fa28f56e34a..a231582fb5d 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java @@ -68,14 +68,10 @@ public class Arguments { " -h [ --help ] Shows this help page.\n" + " --maxpending arg The maximum number of operations that are allowed\n" + " to be pending at any given time. NOTE: This disables dynamic throttling. Use with care.\n" + - " --maxpendingsize arg The maximum size (in bytes) of operations that \n" + - " are allowed to be pending at any given time. \n" + " --maxfeedrate arg Limits the feed rate to the given number (operations/second). You may still want to increase\n" + " the max pending size if your feed rate doesn't reach the desired number.\n" + " --mode arg (=standard) The mode to run vespa-feeder in (standard | benchmark).\n" + " --noretry Turns off retries of recoverable failures.\n" + - " --retrydelay arg (=1) The time (in seconds) to wait between retries of \n" + - " a failed operation.\n" + " --route arg (=default) The route to send the data to.\n" + " --timeout arg (=180) The time (in seconds) allowed for sending \n" + " operations.\n" + @@ -128,14 +124,10 @@ public class Arguments { files.add(getParam(args, arg)); } else if ("--maxpending".equals(arg)) { feederConfigBuilder.maxpendingdocs(Integer.parseInt(getParam(args, arg))); - } else if ("--maxpendingsize".equals(arg)) { - feederConfigBuilder.maxpendingbytes(Integer.parseInt(getParam(args, arg))); } else if ("--mode".equals(arg)) { mode = getParam(args, arg); } else if ("--noretry".equals(arg)) { feederConfigBuilder.retryenabled(false); - } else if ("--retrydelay".equals(arg)) { - feederConfigBuilder.retrydelay(Integer.parseInt(getParam(args, arg))); } else if ("--route".equals(arg)) { feederConfigBuilder.route(getParam(args, arg)); } else if ("--timeout".equals(arg)) { diff --git a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java index 0fc0cdf017c..39b3fa894fd 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java @@ -38,7 +38,7 @@ public class VespaFeederTestCase { @Test public void testParseArgs() throws Exception { String argsS="--abortondataerror false --abortonsenderror false --file foo.xml --maxpending 10" + - " --maxpendingsize 11 --maxfeedrate 29 --mode benchmark --noretry --retrydelay 12 --route e6 --timeout 13 --trace 4" + + " --maxfeedrate 29 --mode benchmark --noretry --route e6 --timeout 13 --trace 4" + " --validate -v bar.xml --priority LOW_1"; Arguments arguments = new Arguments(argsS.split(" "), DummySessionFactory.createWithAutoReply()); @@ -47,12 +47,10 @@ public class VespaFeederTestCase { assertEquals(false, config.abortondocumenterror()); assertEquals(13.0, config.timeout(), 0.00001); assertEquals(false, config.retryenabled()); - assertEquals(12.0, config.retrydelay(), 0.0001); assertEquals("e6", config.route()); assertEquals(4, config.tracelevel()); assertEquals(false, config.abortonsenderror()); assertEquals(10, config.maxpendingdocs()); - assertEquals(11, config.maxpendingbytes()); assertEquals(29.0, config.maxfeedrate(), 0.0001); assertTrue(arguments.isVerbose()); assertFalse(config.createifnonexistent()); |