diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-04-29 06:39:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-29 06:39:42 +0200 |
commit | c522d02dfe96688616aa90b9b3765aa765996f59 (patch) | |
tree | cf57b6c174d11a63c998384edc9e6c0c74b98e89 | |
parent | c0247319394a61ee9a81c1041ca15bb89de09af1 (diff) | |
parent | ed25d1bffcfe410e4806402db41fa9b9654c61ca (diff) |
Merge pull request #9213 from vespa-engine/balder/gc-some-unused-options
GC some options that are not used.
3 files changed, 0 insertions, 12 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..8881162394b 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 @@ -52,8 +52,6 @@ public class ContainerDocumentApi implements FeederConfig.Producer { 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) diff --git a/vespaclient-core/src/main/resources/configdefinitions/feeder.def b/vespaclient-core/src/main/resources/configdefinitions/feeder.def index a376a4807a7..2c95cf25398 100644 --- a/vespaclient-core/src/main/resources/configdefinitions/feeder.def +++ b/vespaclient-core/src/main/resources/configdefinitions/feeder.def @@ -8,9 +8,6 @@ abortondocumenterror bool default=true ## Whether or not to abort if there are errors sending messages to Vespa abortonsenderror bool default=true -## Prefix each document id with this string. -idprefix string default="" - ## Max number of pending operations. maxpendingdocs int default=0 @@ -26,9 +23,6 @@ maxfeedrate double default=0.0 ## Whether or not retrying is enabled. retryenabled bool default=true -## Delay between retries. -retrydelay double default=1 - ## Timeout for messagebus operations. timeout double default=180 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..712ae7cf7fc 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java @@ -128,14 +128,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)) { |