summaryrefslogtreecommitdiffstats
path: root/messagebus
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@verizonmedia.com>2020-04-07 13:06:01 +0000
committerHenning Baldersheim <balder@verizonmedia.com>2020-04-07 13:06:01 +0000
commitef044f95d1c82aff7a0b4fcb88c7fb23c3383398 (patch)
treeb2fad87ebdd91bc33d3b833965d864652db57530 /messagebus
parent27f3c2a9cc66b272d4473bbbc0e7dbf58cd1c78a (diff)
Update abi and min/max confusion.
Diffstat (limited to 'messagebus')
-rw-r--r--messagebus/abi-spec.json1
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/messagebus/abi-spec.json b/messagebus/abi-spec.json
index 9c445aea6fc..159c82971cd 100644
--- a/messagebus/abi-spec.json
+++ b/messagebus/abi-spec.json
@@ -120,6 +120,7 @@
"public void processReply(com.yahoo.messagebus.Reply)",
"public com.yahoo.messagebus.DynamicThrottlePolicy setEfficiencyThreshold(double)",
"public com.yahoo.messagebus.DynamicThrottlePolicy setWindowSizeIncrement(double)",
+ "public com.yahoo.messagebus.DynamicThrottlePolicy setWindowSizeDecrementFactor(double)",
"public com.yahoo.messagebus.DynamicThrottlePolicy setWindowSizeBackOff(double)",
"public com.yahoo.messagebus.DynamicThrottlePolicy setResizeRate(double)",
"public com.yahoo.messagebus.DynamicThrottlePolicy setWeight(double)",
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java
index 13e90b9a65d..76d3bc07d2b 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java
@@ -114,7 +114,7 @@ public class DynamicThrottlePolicy extends StaticThrottlePolicy {
}
double efficiency = throughput*period/windowSize;
if (efficiency < efficiencyThreshold) {
- windowSize = Math.max(windowSize * windowSizeBackOff, windowSize - decrementFactor * windowSizeIncrement);
+ windowSize = Math.min(windowSize * windowSizeBackOff, windowSize - decrementFactor * windowSizeIncrement);
localMaxThroughput = 0;
} else {
windowSize += weight*windowSizeIncrement;