diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-03-11 18:18:30 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-03-11 18:18:30 +0100 |
commit | 5ce79371860589a5a0c8971eb25ee21564376c27 (patch) | |
tree | 6727bfb8dc7a82bab81118e45b78586fa4650158 /config-proxy | |
parent | acb7410c1109426844bb4a4b2fb8c05abec7ec2f (diff) |
Simplify code, as there exists only one config protocol version
Diffstat (limited to 'config-proxy')
-rw-r--r-- | config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java index b73cf89d1b4..0a36f06a1b9 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java @@ -13,22 +13,18 @@ import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; import com.yahoo.jrt.TargetWatcher; import com.yahoo.log.LogLevel; -import com.yahoo.vespa.config.ErrorCode; import com.yahoo.vespa.config.JRTMethods; import com.yahoo.vespa.config.RawConfig; -import com.yahoo.vespa.config.protocol.JRTConfigRequestFactory; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; import com.yahoo.vespa.config.protocol.JRTServerConfigRequestV3; import java.util.Arrays; import java.util.Iterator; -import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; - /** * An RPC server that handles config and file distribution requests. * @@ -132,12 +128,8 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer private void getConfigV3(Request req) { dispatchRpcRequest(req, () -> { JRTServerConfigRequest request = JRTServerConfigRequestV3.createFromRequest(req); - if (isProtocolVersionSupported(request)) { - req.target().addWatcher(this); - getConfigImpl(request); - return; - } - req.returnRequest(); + req.target().addWatcher(this); + getConfigImpl(request); }); } @@ -271,19 +263,6 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer return String.format("%s/%08X", request.methodName(), request.hashCode()); } - private boolean isProtocolVersionSupported(JRTServerConfigRequest request) { - Set<Long> supportedProtocolVersions = JRTConfigRequestFactory.supportedProtocolVersions(); - if (supportedProtocolVersions.contains(request.getProtocolVersion())) { - return true; - } else { - String message = "Illegal protocol version " + request.getProtocolVersion() + - " in request " + request.getShortDescription() + ", only protocol versions " + supportedProtocolVersions + " are supported"; - log.log(LogLevel.ERROR, message); - request.addErrorResponse(ErrorCode.ILLEGAL_PROTOCOL_VERSION, message); - } - return false; - } - /** * Handles all versions of "getConfig" requests. * |