summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-03-12 07:38:33 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2019-03-12 11:44:27 +0100
commit1fe64477e82e5938c3c146f79d98a98f8ad92243 (patch)
tree1f9be80ee15a38becfda880458d1cf297d78500b /container-core
parent69a207f3603c64a1402fb8478b49d61afb8dae55 (diff)
Add coverage info to access log
Diffstat (limited to 'container-core')
-rw-r--r--container-core/abi-spec.json3
-rw-r--r--container-core/src/main/java/com/yahoo/container/handler/Coverage.java7
-rw-r--r--container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java3
3 files changed, 11 insertions, 2 deletions
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index 345911a810f..d20d5643647 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -71,7 +71,8 @@
"public com.yahoo.container.handler.Coverage setNodesTried(int)",
"public int getFullResultSets()",
"public int getResultSets()",
- "public int getResultPercentage()"
+ "public int getResultPercentage()",
+ "public com.yahoo.container.logging.Coverage toLoggingCoverage()"
],
"fields": [
"protected long docs",
diff --git a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
index 84cc0734e7c..2ec5d34a0a6 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
@@ -194,4 +194,11 @@ public class Coverage {
return getFullResultSets() * 100 / getResultSets();
}
+ public com.yahoo.container.logging.Coverage toLoggingCoverage() {
+ int degradation = com.yahoo.container.logging.Coverage.toDegradation(isDegradedByMatchPhase(),
+ isDegradedByTimeout(),
+ isDegradedByAdapativeTimeout());
+ return new com.yahoo.container.logging.Coverage(getDocs(), getActive(), getSoonActive(), degradation);
+ }
+
}
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java
index 5af94c798d1..92fe347f7d1 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java
@@ -58,7 +58,8 @@ public class LoggingRequestHandlerTestCase {
@Override
public HitCounts getHitCounts() {
- return new HitCounts(1, 1, 1, 1, 1);
+ return new HitCounts(1, 1, 1, 1, 1,
+ getCoverage().toLoggingCoverage());
}
@Override