summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-11-29 20:12:09 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-11-29 20:12:09 +0100
commit598a290fdf6f62e10b656148310ebba9441adc2d (patch)
treea40f179bc9721095e72343c4f7bbb38e5c72bf3f
parent410688c3f0473a749c46046822eff4acff9b661b (diff)
Try fixed at maxpending 2 for comparison
-rw-r--r--clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java3
-rw-r--r--messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java8
2 files changed, 6 insertions, 5 deletions
diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
index 5fe3c269c20..924a408292c 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
@@ -196,7 +196,8 @@ public class Reindexer {
parameters.setThrottlePolicy(new DynamicThrottlePolicy().setWindowSizeIncrement(1)
.setWindowSizeDecrementFactor(5)
.setWeight(0.1)
- .setMinWindowSize(1));
+ .setMinWindowSize(2)
+ .setMaxWindowSize(2));
parameters.setRemoteDataHandler(cluster.name());
parameters.setResumeToken(progress);
parameters.setFieldSet(type.getName() + ":[document]");
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java
index f6185f1d410..f5ef5ea4f1f 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java
@@ -137,16 +137,16 @@ public class ThrottlerTestCase {
.setResizeRate(1);
double windowSize = getWindowSize(policy, timer, 100);
- assertTrue(windowSize >= 90 && windowSize <= 110);
+ assertTrue(windowSize >= 90 && windowSize <= 105);
windowSize = getWindowSize(policy, timer, 200);
- assertTrue(windowSize >= 90 && windowSize <= 210);
+ assertTrue(windowSize >= 180 && windowSize <= 205);
windowSize = getWindowSize(policy, timer, 50);
- assertTrue(windowSize >= 9 && windowSize <= 55);
+ assertTrue(windowSize >= 45 && windowSize <= 55);
windowSize = getWindowSize(policy, timer, 500);
- assertTrue(windowSize >= 90 && windowSize <= 505);
+ assertTrue(windowSize >= 450 && windowSize <= 505);
windowSize = getWindowSize(policy, timer, 100);
assertTrue(windowSize >= 90 && windowSize <= 115);