Don't put files below files/ in ZooKeeper

This is undocumented and can only do harm as large files do not
belong in ZooKeeper and are handled fine regardless of where they are put.

2 files changed, 0 insertions, 9 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
index 30aff7a3486..0653254fdb5 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
@@ -197,9 +197,6 @@ public class ZooKeeperClient {
         feedDirZooKeeper(app.getFile(Path.fromString(ApplicationPackage.ROUTINGTABLES_DIR)),
                          getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH).append(ApplicationPackage.ROUTINGTABLES_DIR),
                          xmlFilter, true);
-        feedDirZooKeeper(app.getFile(Path.fromString(ApplicationPackage.FILES_DIR)),
-                         getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH).append(ApplicationPackage.FILES_DIR),
-                         true);
     }
 
     private void feedDirZooKeeper(ApplicationFile file, Path zooKeeperAppPath, boolean recurse) throws IOException {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
index 1bd9249644b..e9894ca26cf 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
@@ -114,12 +114,6 @@ public class ZooKeeperClientTest extends TestWithCurator {
     }
 
     @Test
-    public void testFeedUserDefinedFiles() {
-        assertEquals(zk.getData(appPath+ ConfigCurator.USERAPP_ZK_SUBPATH + "/files", "foo.json"), "foo : foo\n");
-        assertEquals(zk.getData(appPath+ ConfigCurator.USERAPP_ZK_SUBPATH + "/files/sub", "bar.json"), "bar : bar\n");
-    }
-
-    @Test
     public void testFeedAppMetaDataToZooKeeper() {
         assertTrue(zk.exists(appPath, ConfigCurator.META_ZK_PATH));
         ApplicationMetaData metaData = ApplicationMetaData.fromJsonString(zk.getData(appPath, ConfigCurator.META_ZK_PATH));