diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-03-18 10:52:20 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-03-18 10:52:20 +0100 |
commit | 756019f19cae70fd6a25ba39156841aef62ce438 (patch) | |
tree | f3489f2d68526b5f8f357a80d16cf9fac86015dd /zookeeper-server | |
parent | e79c5b08d40fccace6c6ebc69ade1c15fcc7c84b (diff) |
Use default metrics provider
Diffstat (limited to 'zookeeper-server')
2 files changed, 1 insertions, 3 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java index 749f713b29e..c58c97845e3 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java @@ -76,7 +76,6 @@ public class Configurator { sb.append("standaloneEnabled=false").append("\n"); sb.append("reconfigEnabled=true").append("\n"); sb.append("skipACL=yes").append("\n"); - sb.append("metricsProvider.className=org.apache.zookeeper.metrics.impl.NullMetricsProvider\n"); ensureThisServerIsRepresented(config.myid(), config.server()); config.server().forEach(server -> addServerToCfg(sb, server)); sb.append(new TlsQuorumConfig().createConfig(config, tlsContext)); diff --git a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java index 147b61a804c..f0d3df43c4e 100644 --- a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java +++ b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java @@ -175,8 +175,7 @@ public class ConfiguratorTest { "quorumListenOnAllIPs=true\n" + "standaloneEnabled=false\n" + "reconfigEnabled=true\n" + - "skipACL=yes\n" + - "metricsProvider.className=org.apache.zookeeper.metrics.impl.NullMetricsProvider\n"; + "skipACL=yes\n"; } private void validateConfigFileSingleHost(File cfgFile) { |