Revert "GC some options that are not used."

3 files changed, 12 insertions, 0 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 8881162394b..c2394e7cac3 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,6 +52,8 @@ 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 2c95cf25398..a376a4807a7 100644
--- a/vespaclient-core/src/main/resources/configdefinitions/feeder.def
+++ b/vespaclient-core/src/main/resources/configdefinitions/feeder.def
@@ -8,6 +8,9 @@ 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
 
@@ -23,6 +26,9 @@ 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 712ae7cf7fc..fa28f56e34a 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java
@@ -128,10 +128,14 @@ 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)) {