Revert Netty timeout changes and adjust phi threshold
This reverts commit c1b41d4e280ad141261114155d5b87af1b547f39.
Change-Id: Ica3462014422080255d579cb715eb06b4fe581e3
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/NettyMessagingManager.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/NettyMessagingManager.java
index 454f1bc..b4a8f13 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/NettyMessagingManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/NettyMessagingManager.java
@@ -106,14 +106,12 @@
public class NettyMessagingManager implements MessagingService {
private static final long HISTORY_EXPIRE_MILLIS = Duration.ofMinutes(1).toMillis();
private static final long TIMEOUT_INTERVAL = 50;
- private static final int WINDOW_SIZE = 60;
- private static final int WINDOW_UPDATE_SAMPLE_SIZE = 100;
- private static final long WINDOW_UPDATE_MILLIS = 10000;
+ private static final int WINDOW_SIZE = 100;
private static final int MIN_SAMPLES = 25;
- private static final int MIN_STANDARD_DEVIATION = 100;
+ private static final double PHI_FACTOR = 1.0 / Math.log(10.0);
private static final int PHI_FAILURE_THRESHOLD = 12;
private static final long MIN_TIMEOUT_MILLIS = 100;
- private static final long MAX_TIMEOUT_MILLIS = 5000;
+ private static final long MAX_TIMEOUT_MILLIS = 15000;
private static final int CHANNEL_POOL_SIZE = 8;
private static final byte[] EMPTY_PAYLOAD = new byte[0];
@@ -1011,9 +1009,6 @@
*/
private static final class RequestMonitor {
private final DescriptiveStatistics samples = new SynchronizedDescriptiveStatistics(WINDOW_SIZE);
- private final AtomicLong max = new AtomicLong();
- private volatile int replyCount;
- private volatile long lastUpdate = System.currentTimeMillis();
/**
* Adds a reply time to the history.
@@ -1021,25 +1016,7 @@
* @param replyTime the reply time to add to the history
*/
void addReplyTime(long replyTime) {
- max.accumulateAndGet(replyTime, Math::max);
-
- // If at least WINDOW_UPDATE_SAMPLE_SIZE response times have been recorded, and at least
- // WINDOW_UPDATE_MILLIS have passed since the last update, record the maximum response time in the samples.
- int replyCount = ++this.replyCount;
- if (replyCount >= WINDOW_UPDATE_SAMPLE_SIZE
- && System.currentTimeMillis() - lastUpdate > WINDOW_UPDATE_MILLIS) {
- synchronized (this) {
- if (System.currentTimeMillis() - lastUpdate > WINDOW_UPDATE_MILLIS) {
- long lastMax = max.get();
- if (lastMax > 0) {
- samples.addValue(lastMax);
- lastUpdate = System.currentTimeMillis();
- this.replyCount = 0;
- max.set(0);
- }
- }
- }
- }
+ samples.addValue(replyTime);
}
/**
@@ -1049,7 +1026,7 @@
* @return indicates whether the request should be timed out
*/
boolean isTimedOut(long elapsedTime) {
- return samples.getN() == WINDOW_SIZE && phi(elapsedTime) >= PHI_FAILURE_THRESHOLD;
+ return phi(elapsedTime) >= PHI_FAILURE_THRESHOLD;
}
/**
@@ -1073,14 +1050,7 @@
* @return phi
*/
private double computePhi(DescriptiveStatistics samples, long elapsedTime) {
- double meanMillis = samples.getMean();
- double y = (elapsedTime - meanMillis) / Math.max(samples.getStandardDeviation(), MIN_STANDARD_DEVIATION);
- double e = Math.exp(-y * (1.5976 + 0.070566 * y * y));
- if (elapsedTime > meanMillis) {
- return -Math.log10(e / (1.0 + e));
- } else {
- return -Math.log10(1.0 - 1.0 / (1.0 + e));
- }
+ return samples.getN() > 0 ? PHI_FACTOR * elapsedTime / samples.getMean() : 100;
}
}
}