diff options
-rw-r--r-- | clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java | 2 | ||||
-rw-r--r-- | messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java | 4 |
2 files changed, 4 insertions, 2 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 36431655052..f59780faaed 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java @@ -193,7 +193,7 @@ public class Reindexer { VisitorParameters createParameters(DocumentType type, ProgressToken progress) { VisitorParameters parameters = new VisitorParameters(type.getName()); - parameters.setThrottlePolicy(new DynamicThrottlePolicy().setWindowSizeIncrement(1) + parameters.setThrottlePolicy(new DynamicThrottlePolicy().setWindowSizeIncrement(0.5) .setWindowSizeDecrementFactor(5) .setResizeRate(10) .setMinWindowSize(1)); diff --git a/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java index 28d74c0b9f0..1cfbefae29b 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java @@ -157,6 +157,7 @@ public class DynamicThrottlePolicy extends StaticThrottlePolicy { */ public DynamicThrottlePolicy setWindowSizeIncrement(double windowSizeIncrement) { this.windowSizeIncrement = windowSizeIncrement; + this.windowSize = Math.max(this.minWindowSize, this.windowSizeIncrement); return this; } @@ -240,6 +241,7 @@ public class DynamicThrottlePolicy extends StaticThrottlePolicy { */ public DynamicThrottlePolicy setMinWindowSize(double min) { this.minWindowSize = min; + this.windowSize = Math.max(this.minWindowSize, this.windowSizeIncrement); return this; } @@ -265,7 +267,7 @@ public class DynamicThrottlePolicy extends StaticThrottlePolicy { * @return the max limit */ public int getMaxPendingCount() { - return (int)windowSize; + return (int) windowSize; } } |