summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahooinc.com>2022-07-01 12:15:49 +0000
committerTor Brede Vekterli <vekterli@yahooinc.com>2022-07-01 12:47:47 +0000
commit331dfa1c316e1663e84a792aabba75fce284356d (patch)
treed452d7624e5652d25ba85d3be657d7c02af6a2ad /searchcore
parente72d4b1c5b850783cfaa5c297351c330c4c034f8 (diff)
GC all legacy storage protocol serialization versions
Legacy version negotiation only happens over MessageBus transport, which is now removed. Current StorageAPI RPC transport always uses the newest version directly since it's built around Protobuf.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/bmcluster/bm_message_bus.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_message_bus.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_message_bus.cpp
index ff4fed44d22..2622de6320e 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_message_bus.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_message_bus.cpp
@@ -10,7 +10,6 @@
#include <vespa/messagebus/ireplyhandler.h>
#include <vespa/documentapi/messagebus/documentprotocol.h>
#include <vespa/documentapi/messagebus/messages/documentmessage.h>
-#include <vespa/storageapi/mbusprot/storageprotocol.h>
#include <vespa/storageapi/mbusprot/storagereply.h>
#include <vespa/vespalib/stllike/asciistream.h>
@@ -21,7 +20,6 @@ using documentapi::DocumentProtocol;
using mbus::RPCMessageBus;
using mbus::Reply;
using mbus::SourceSession;
-using storage::mbusprot::StorageProtocol;
using storage::mbusprot::StorageReply;
namespace search::bmcluster {
@@ -97,15 +95,7 @@ BmMessageBus::ReplyHandler::handleReply(std::unique_ptr<Reply> reply)
failed = true; // empty reply or error
} else {
auto protocol = reply->getProtocol();
- if (protocol == DocumentProtocol::NAME) {
- } else if (protocol == StorageProtocol::NAME) {
- auto sreply = dynamic_cast<storage::mbusprot::StorageReply *>(reply.get());
- if (sreply != nullptr) {
- check_error(*sreply->getReply());
- } else {
- failed = true; // unexpected message type
- }
- } else {
+ if (protocol != DocumentProtocol::NAME) {
failed = true; // unexpected protocol
}
}
@@ -139,7 +129,6 @@ BmMessageBus::BmMessageBus(const config::ConfigUri& config_uri,
mbus::RPCNetworkParams params(config_uri);
mbus::ProtocolSet protocol_set;
protocol_set.add(std::make_shared<DocumentProtocol>(document_type_repo));
- protocol_set.add(std::make_shared<StorageProtocol>(document_type_repo));
params.setIdentity(mbus::Identity("vespa-bm-client"));
_message_bus = std::make_unique<mbus::RPCMessageBus>(
protocol_set,