diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-03-01 17:34:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-01 17:34:44 +0100 |
| commit | 616be2724603dfac17d45db8eccd52369988a7d9 (patch) | |
| tree | 39c01dd06a6200c86b9e75601c3160228de139c9 | |
| parent | ed4efd875596969e177fee409c311a4fc35a7b0c (diff) | |
| parent | bdab7a14004860beef7a10c3ac0d13fff40e14da (diff) | |
Merge pull request #16726 from vespa-engine/balder/do-not-use-vespamalloc-for-cc
Do not use vespamalloc for clustercontroller as it is pure java.
2 files changed, 15 insertions, 2 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java index f1e0b6d1239..60835d5bb4f 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java @@ -6,18 +6,26 @@ import com.yahoo.vespa.clustercontroller.core.ClusterStateBundle; import com.yahoo.vespa.clustercontroller.core.ContentCluster; import com.yahoo.vespa.clustercontroller.core.rpc.EnvelopedClusterStateBundleCodec; import com.yahoo.vespa.clustercontroller.core.rpc.SlimeClusterStateBundleCodec; -import org.apache.zookeeper.*; +import org.apache.zookeeper.CreateMode; +import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.WatchedEvent; +import org.apache.zookeeper.Watcher; +import org.apache.zookeeper.ZooDefs; +import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.data.Stat; import org.apache.zookeeper.data.ACL; import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; +import java.util.TreeMap; import java.util.logging.Level; import com.yahoo.vdslib.state.NodeState; import com.yahoo.vdslib.state.State; import com.yahoo.vdslib.state.Node; import java.util.logging.Logger; -import java.util.*; import java.io.IOException; import java.io.StringWriter; import java.io.PrintWriter; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java index eefe245f060..1e4a3b1e003 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java @@ -174,4 +174,9 @@ public class ClusterControllerContainer extends Container implements } } + @Override + protected String defaultPreload() { + return ""; + } + } |