Skip to content

Commit

Permalink
Merge pull request #32078 from vespa-engine/revert-31731-hmusum/log-j…
Browse files Browse the repository at this point in the history
…utemaxbuffer

Revert "Temporarily log juteMaxBuffer"
  • Loading branch information
Harald Musum authored Aug 5, 2024
2 parents 23726c1 + e16e634 commit d4cf558
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
3 changes: 0 additions & 3 deletions zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import static java.util.logging.Level.INFO;

/**
* Curator interface for Vespa.
* This contains method for constructing common recipes and utilities as well as
Expand Down Expand Up @@ -131,7 +129,6 @@ private Curator(ConnectionSpec connectionSpec, CuratorFramework curatorFramework
this.connectionSpec = Objects.requireNonNull(connectionSpec);
this.curatorFramework = Objects.requireNonNull(curatorFramework);
this.juteMaxBuffer = juteMaxBuffer;
LOG.log(INFO, "Using juteMaxBuffer=" + this.juteMaxBuffer);
this.sessionTimeout = sessionTimeout;
addLoggingListener();
curatorFramework.start();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import static com.yahoo.stream.CustomCollectors.toLinkedMap;
import static com.yahoo.vespa.defaults.Defaults.getDefaults;
import static java.util.logging.Level.INFO;

public class Configurator {

Expand All @@ -48,7 +47,6 @@ public Configurator(ZookeeperServerConfig zookeeperServerConfig) {
// Doc says that it is max size of data in a zookeeper node, but it goes for everything that
// needs to be serialized, see https://issues.apache.org/jira/browse/ZOOKEEPER-1162 for details
System.setProperty(ZOOKEEPER_JUTE_MAX_BUFFER, Integer.valueOf(zookeeperServerConfig.juteMaxBuffer()).toString());
log.log(INFO, "Using juteMaxBuffer=" + zookeeperServerConfig.juteMaxBuffer());
// Need to set this as a system properties instead of config, config does not work
System.setProperty("zookeeper.authProvider.x509", "com.yahoo.vespa.zookeeper.VespaMtlsAuthenticationProvider");
// Need to set this as a system property, otherwise it will be parsed for _every_ packet and an exception will be thrown (and handled)
Expand Down

0 comments on commit d4cf558

Please sign in to comment.