summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java1
-rw-r--r--searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
index bf3ba084091..88acf6cafb8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
@@ -49,6 +49,7 @@ public class ClusterControllerCluster extends AbstractConfigProducer<ClusterCont
public void getConfig(ZookeeperServerConfig.Builder builder) {
builder.clientPort(ZK_CLIENT_PORT);
builder.juteMaxBuffer(1024 * 1024); // 1 Mb should be more than enough for cluster controller
+ builder.snapshotCount(1000); // Use a low value, few transactions per time unit in cluster controller
for (ClusterControllerContainer container : containerCluster.getContainers()) {
ZookeeperServerConfig.Server.Builder serverBuilder = new ZookeeperServerConfig.Server.Builder();
serverBuilder.hostname(container.getHostName());
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
index 26899d88b3a..12e80fe7402 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
@@ -101,6 +101,7 @@ SummarySetup(const vespalib::string & baseDir, const DocTypeName & docTypeName,
docsum_blob_entry_filter.add_skip(RES_FLOAT);
docsum_blob_entry_filter.add_skip(RES_DOUBLE);
docsum_blob_entry_filter.add_skip(RES_INT64);
+ docsum_blob_entry_filter.add_skip(RES_STRING);
docsum_blob_entry_filter.add_skip(RES_DATA);
docsum_blob_entry_filter.add_skip(RES_LONG_DATA);
docsum_blob_entry_filter.add_skip(RES_JSONSTRING);