diff options
author | Harald Musum <musum@oath.com> | 2018-03-23 12:26:19 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-03-23 12:26:19 +0100 |
commit | 8585568d0e2f1a87b863f5a0103c5ae09e101afa (patch) | |
tree | f95de62103bfad85e3ce2b72bb9c94605b41951f /config-model-api | |
parent | a4e249f407ddd75c8d855996e0e2b3db3869879d (diff) |
Remove unused filedistribution methods
Diffstat (limited to 'config-model-api')
3 files changed, 0 insertions, 21 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 ae39440335a..ac1bcfa542a 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 @@ -5,7 +5,6 @@ import com.yahoo.config.FileReference; import com.yahoo.vespa.defaults.Defaults; import java.io.File; -import java.util.Collection; import java.util.Set; /** @@ -14,10 +13,6 @@ import java.util.Set; * @author Ulf Lilleengen */ public interface FileDistribution { - - // TODO: Remove when 6.223 is oldest version used - default void sendDeployedFiles(String hostName, Set<FileReference> fileReferences) {} - /** * Notifies client which file references to download. Used to start downloading early (while * preparing application package). @@ -28,12 +23,6 @@ public interface FileDistribution { */ void startDownload(String hostName, int port, Set<FileReference> fileReferences); - // TODO: Remove when 6.223 is oldest version used - default void reloadDeployFileDistributor() {} - - // TODO: Remove when 6.223 is oldest version used - default void removeDeploymentsThatHaveDifferentApplicationId(Collection<String> targetHostnames) {} - static String getDefaultFileDBRoot() { return Defaults.getDefaults().underVespaHome("var/db/vespa/filedistribution"); } diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java index b8b329f2b04..cc17cae337c 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java @@ -49,15 +49,6 @@ public interface Model { /** - * Tells file distributor to rescan all files. At the moment this is a very expensive operation, so should only be done - * once per deployment. - * @param fileDistribution {@link com.yahoo.config.model.api.FileDistribution} instance. - */ - // TODO: Remove when 6.206 is the oldest version in use - @Deprecated - default void reloadDeployFileDistributor(FileDistribution fileDistribution) { } - - /** * Gets the allocated hosts for this model. * * @return {@link AllocatedHosts} instance, if available. diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 7b28edbb2fc..d4c961068f1 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -46,7 +46,6 @@ public interface ModelContext { boolean hostedVespa(); Zone zone(); Set<Rotation> rotations(); - default boolean disableFileDistributor() { return true; } // TODO: Remove when oldest version in use is 6.206 } } |