diff options
author | Harald Musum <musum@oath.com> | 2018-05-31 13:39:52 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-05-31 13:39:52 +0200 |
commit | 92d7a982270959111db8988e78539980d9b69283 (patch) | |
tree | 61c46a52947fb8f5b9265cfe8a8b1737c6cf7086 | |
parent | c656a4e6b40852006970814f6aeef9f8014bd858 (diff) |
Delete /vespa/config from zookeeper, has not been used for many years
3 files changed, 4 insertions, 2 deletions
diff --git a/config-lib/src/main/java/com/yahoo/config/FileReference.java b/config-lib/src/main/java/com/yahoo/config/FileReference.java index b3dbb80f51f..7d455c58b30 100755 --- a/config-lib/src/main/java/com/yahoo/config/FileReference.java +++ b/config-lib/src/main/java/com/yahoo/config/FileReference.java @@ -20,8 +20,7 @@ public final class FileReference { private final String value; public FileReference(String value) { - Objects.requireNonNull(value); - this.value = value; + this.value = Objects.requireNonNull(value); } public String value() { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainer.java index 852768b6937..fd57732eb30 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainer.java @@ -19,5 +19,6 @@ public class ZooKeeperDataMaintainer extends Maintainer { @Override protected void maintain() { curator.delete(Path.fromString("/vespa/filedistribution")); + curator.delete(Path.fromString("/vespa/config")); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainerTest.java index 1c886adde73..ceb9b7129b4 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainerTest.java @@ -20,11 +20,13 @@ public class ZooKeeperDataMaintainerTest { curator.create(Path.fromString("/foo")); curator.create(Path.fromString("/vespa/bar")); curator.create(Path.fromString("/vespa/filedistribution")); + curator.create(Path.fromString("/vespa/config")); new ZooKeeperDataMaintainer(tester.applicationRepository(), curator, Duration.ofDays(1)).run(); assertTrue(curator.exists(Path.fromString("/foo"))); assertTrue(curator.exists(Path.fromString("/vespa"))); assertFalse(curator.exists(Path.fromString("/vespa/filedistribution"))); + assertFalse(curator.exists(Path.fromString("/vespa/config"))); } } |