aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-02-22 15:13:22 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2019-02-22 15:13:22 +0100
commit17a5c1cd9505c2593dfa23e80f5adce31bb59e8d (patch)
tree6690c99fbc1f4a4514071b7c1e29724038657fb7
parent869d50f3237803d916766a035a6e353f6de8c8d3 (diff)
Nonfunctional changes only
-rw-r--r--Code-map.md2
-rw-r--r--container-search/src/main/java/com/yahoo/fs4/QueryPacket.java2
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java2
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthMonitor.java2
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthUpdater.java2
5 files changed, 9 insertions, 1 deletions
diff --git a/Code-map.md b/Code-map.md
index fba22bdf8e5..6eae723f31d 100644
--- a/Code-map.md
+++ b/Code-map.md
@@ -1,3 +1,5 @@
+<!-- Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+
# A map to the Vespa code base
You want to get familiar with the Vespa code base but don't know where to start?
diff --git a/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java b/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java
index e3c10c1f8ce..77fb740043e 100644
--- a/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java
+++ b/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java
@@ -100,7 +100,7 @@ public class QueryPacket extends Packet {
byte[] stripped = new byte[encodedBody.length - (ignoreableSize + getSessionKeySkipLength()) + utf8Summary.length + 1];
System.arraycopy(encodedBody, 0, stripped, 0, ignoreableOffset);
- stripped[1] = (byte)(stripped[1] & 0x7f); // Ignor sessionKey feature flag
+ stripped[1] = (byte)(stripped[1] & 0x7f); // Ignore sessionKey feature flag
System.arraycopy(utf8Summary, 0, stripped, ignoreableOffset, utf8Summary.length);
stripped[ignoreableOffset + utf8Summary.length] = 0;
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java
index 88aefe42a14..ede11c48de4 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java
@@ -22,6 +22,7 @@ import static com.yahoo.yolean.Exceptions.uncheck;
* @author hakonhall
*/
public class StateV1HealthClient implements AutoCloseable {
+
private static final long MAX_CONTENT_LENGTH = 1L << 20; // 1 MB
private static final ObjectMapper MAPPER = new ObjectMapper();
private static final Logger logger = Logger.getLogger(StateV1HealthClient.class.getName());
@@ -71,4 +72,5 @@ public class StateV1HealthClient implements AutoCloseable {
logger.log(LogLevel.WARNING, "Failed to close CloseableHttpClient", e);
}
}
+
}
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthMonitor.java
index 7a6494e0122..b28ceeddae0 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthMonitor.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthMonitor.java
@@ -13,6 +13,7 @@ import java.time.Duration;
* @author hakon
*/
class StateV1HealthMonitor implements HealthMonitor {
+
private final StateV1HealthUpdater updater;
private final Cancellable periodicExecution;
@@ -30,4 +31,5 @@ class StateV1HealthMonitor implements HealthMonitor {
public void close() {
periodicExecution.cancel();
}
+
}
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthUpdater.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthUpdater.java
index 6a6768aa78b..985685ebb8d 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthUpdater.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthUpdater.java
@@ -13,6 +13,7 @@ import java.util.Optional;
* @author hakonhall
*/
class StateV1HealthUpdater implements HealthUpdater {
+
private final String endpoint;
private final StateV1HealthClient healthClient;
@@ -56,4 +57,5 @@ class StateV1HealthUpdater implements HealthUpdater {
public void close() {
healthClient.close();
}
+
}