summaryrefslogtreecommitdiffstats
path: root/messagebus
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@vespa.ai>2024-02-21 14:37:44 +0000
committerTor Brede Vekterli <vekterli@vespa.ai>2024-02-21 14:37:44 +0000
commit899e0389a2aa9bd2abb2ef7c74a541e348199923 (patch)
tree632e1a908be8958f1ef785f6d96d353c2e3a2ae0 /messagebus
parent11c0b2581dfc9f0e995a8171eb99a9793f7c4b38 (diff)
Tag Protobuf protocol boundary version and add binary test files
All _reported_ versions >= 8.310 use Protobuf protocol, all lower versions use the legacy protocol. Reported version is controlled by an environment variable and defaults to 8.309, i.e. the legacy version.
Diffstat (limited to 'messagebus')
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java4
-rw-r--r--messagebus/src/vespa/messagebus/network/rpcnetwork.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java
index 3ab62542ace..d55c99c1465 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java
@@ -309,9 +309,9 @@ public class RPCNetwork implements Network, MethodHandler {
// TODO remove this glorious hack once protobuf protocol is enabled by default
var maybeEnvVal = System.getenv("VESPA_MBUS_DOCUMENTAPI_USE_PROTOBUF");
if ("true".equals(maybeEnvVal) || "yes".equals(maybeEnvVal)) {
- return new Version(8, 304); // _Allows_ new protobuf protocol
+ return new Version(8, 310); // _Allows_ new protobuf protocol
}
- return new Version(8, 303); // _Disallows_ new protobuf protocol
+ return new Version(8, 309); // _Disallows_ new protobuf protocol
}
private static final Version REPORTED_VERSION = deriveSupportedProtocolVersion();
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
index f626e2c325b..3599142d69c 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
@@ -159,9 +159,9 @@ namespace {
// and the exact same as that used in Java for the same purposes. Or else!
const char* maybe_env_val = getenv("VESPA_MBUS_DOCUMENTAPI_USE_PROTOBUF");
if (maybe_env_val && (("true"sv == maybe_env_val) || ("yes"sv == maybe_env_val))) {
- return {8, 304}; // _Allows_ new protobuf protocol
+ return {8, 310}; // _Allows_ new protobuf protocol
}
- return {8, 303}; // _Disallows_ new protobuf protocol
+ return {8, 309}; // _Disallows_ new protobuf protocol
}
}