Merge pull request #10087 from vespa-engine/hmusum/cleanup-configdefinition-2

Hmusum/cleanup configdefinition 2

3 files changed, 7 insertions, 27 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 110e73bcdf9..484124991d9 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
@@ -288,22 +288,14 @@ public class ZooKeeperClient {
         for (Map.Entry<ConfigDefinitionKey, UnparsedConfigDefinition> entry : configDefs.entrySet()) {
             ConfigDefinitionKey key = entry.getKey();
             String contents = entry.getValue().getUnparsedContent();
-            write(key.getName(), key.getNamespace(), getZooKeeperAppPath(ConfigCurator.USER_DEFCONFIGS_ZK_SUBPATH).getAbsolute(), contents);
-            write(key.getName(), key.getNamespace(), getZooKeeperAppPath(ConfigCurator.DEFCONFIGS_ZK_SUBPATH).getAbsolute(), contents);
+            writeConfigDefinition(key.getName(), key.getNamespace(), getZooKeeperAppPath(ConfigCurator.USER_DEFCONFIGS_ZK_SUBPATH).getAbsolute(), contents);
+            writeConfigDefinition(key.getName(), key.getNamespace(), getZooKeeperAppPath(ConfigCurator.DEFCONFIGS_ZK_SUBPATH).getAbsolute(), contents);
         }
         logger.log(LogLevel.FINE, configDefs.size() + " user config definitions");
     }
 
-    private void write(String name, String namespace, String path, String data) {
-        write(name, namespace, "", path, com.yahoo.text.Utf8.toBytes(data));
-    }
-
-    private void write(String name, String namespace, String version, String path, byte[] data) {
-        configCurator.putDefData(
-                ("".equals(namespace)) ? name : (namespace + "." + name),
-                version,
-                path,
-                data);
+    private void writeConfigDefinition(String name, String namespace, String path, String data) {
+        configCurator.putDefData(namespace + "." + name, path, com.yahoo.text.Utf8.toBytes(data));
     }
 
     private void write(Version vespaVersion, FileRegistry fileRegistry) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
index 92d7589ea43..56709225c1d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
@@ -284,23 +284,11 @@ public class ConfigCurator {
      * Puts config definition data and metadata into ZK.
      *
      * @param name    The config definition name (including namespace)
-     * @param version The config definition version
      * @param path    /zoopath
      * @param data    The contents to write to ZK (as a byte array)
      */
-    public void putDefData(String name, String version, String path, byte[] data) {
-        if (version == null) {
+    public void putDefData(String name, String path, byte[] data) {
             putData(path, name, data);
-        } else {
-            String fullPath = createFullPath(path, name + "," + version);
-            if (exists(fullPath)) {
-                // TODO This should not happen when all the compatibility hacks in 5.1 have been removed
-                log.log(LogLevel.INFO, "There already exists a config definition '" + name + "', skipping feeding this one to ZooKeeper");
-            }
-            else {
-                putData(fullPath, data);
-            }
-        }
     }
 
     /**
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 daf981611e4..d01ebad8c26 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
@@ -101,14 +101,14 @@ public class ZooKeeperClientTest {
         List<String> children = zk.getChildren(defsPath);
         assertEquals(defsPath + " children", 2, children.size());
         Collections.sort(children);
-        assertThat(children.get(0), is("a.b.test2,"));
+        assertThat(children.get(0), is("a.b.test2"));
 
         assertTrue(zk.exists(appPath, ConfigCurator.USER_DEFCONFIGS_ZK_SUBPATH.replaceFirst("/", "")));
         String userDefsPath = appPath + ConfigCurator.USER_DEFCONFIGS_ZK_SUBPATH;
         children = zk.getChildren(userDefsPath);
         assertThat(children.size(), is(2));
         Collections.sort(children);
-        assertThat(children.get(0), is("a.b.test2,"));
+        assertThat(children.get(0), is("a.b.test2"));
     }
 
     // TODO: Evaluate if we want this or not