diff options
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java | 4 | ||||
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java index dd4706461ad..f1fc066bce3 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java @@ -3,7 +3,6 @@ package com.yahoo.config.model.api; import com.yahoo.config.FileReference; -import java.io.File; import java.util.Set; /** @@ -22,7 +21,4 @@ public interface FileDistribution { */ void startDownload(String hostName, int port, Set<FileReference> fileReferences); - // TODO: Remove when 7.508 is latest version in use - default File getFileReferencesDir() {return null; } - } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java index 99ffff6403b..6d16520d77b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java @@ -558,7 +558,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener { private void invokeRpcIfValidConnection(Request request) { if (target.isValid()) { - target.invokeSync(request, 600); + target.invokeSync(request, 60); } else { throw new RuntimeException("Connection to " + target + " is invalid", target.getConnectionLostReason()); } |