diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-12 15:46:04 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-12 15:46:04 +0200 |
commit | 751002293a4bb389c7db69a3af28b467c0f55478 (patch) | |
tree | ae2ef16f431495de3a577a1a7806dc98ca437d60 /vespaclient-container-plugin | |
parent | a9e3a26a04f795c20b4ed6ca3f8731b3fbcbe73f (diff) |
A collection of code cleanup in messagebus. And a bonus of catching missing shutdown of config subscription.
Diffstat (limited to 'vespaclient-container-plugin')
2 files changed, 2 insertions, 6 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java index 5f49dd5ddf8..ac2c9515d71 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java @@ -6,7 +6,6 @@ import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.document.DocumentTypeManager; import com.yahoo.documentapi.messagebus.protocol.DocumentMessage; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; -import com.yahoo.documentapi.metrics.DocumentOperationType; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.ReferencedResource; import com.yahoo.log.LogLevel; @@ -23,7 +22,6 @@ import com.yahoo.yolean.Exceptions; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.time.Duration; import java.time.Instant; import java.util.Optional; @@ -297,7 +295,7 @@ class ClientFeederV3 { } private void setMessageParameters(DocumentOperationMessageV3 msg, FeederSettings settings) { - msg.getMessage().setContext(new ReplyContext(msg.getOperationId(), feedReplies, DocumentOperationType.fromMessage(msg.getMessage()))); + msg.getMessage().setContext(new ReplyContext(msg.getOperationId(), feedReplies)); if (settings.traceLevel != null) { msg.getMessage().getTrace().setLevel(settings.traceLevel); } diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ReplyContext.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ReplyContext.java index bf18616053b..b8cabe5cc48 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ReplyContext.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ReplyContext.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.http.server; -import com.yahoo.documentapi.metrics.DocumentOperationType; import com.yahoo.vespa.http.client.core.OperationStatus; import java.util.concurrent.BlockingQueue; @@ -14,11 +13,10 @@ import java.util.concurrent.BlockingQueue; public class ReplyContext { public final String docId; - public DocumentOperationType documentOperationType; public final BlockingQueue<OperationStatus> feedReplies; public final long creationTime; - public ReplyContext(String docId, BlockingQueue<OperationStatus> feedReplies, DocumentOperationType documentOperationType) { + public ReplyContext(String docId, BlockingQueue<OperationStatus> feedReplies) { this.docId = docId; this.feedReplies = feedReplies; this.creationTime = System.currentTimeMillis(); |