Merge pull request #26436 from vespa-engine/balder/gc-dangerous-docstore-options-with-no-right-to-live

summary.cache.initialentries and summary.log.chunk.skipcrconread does…

2 files changed, 5 insertions, 2 deletions

diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def
index 5829666c41b..375ff0f2012 100644
--- a/searchcore/src/vespa/searchcore/config/proton.def
+++ b/searchcore/src/vespa/searchcore/config/proton.def
@@ -212,11 +212,13 @@ summary.cache.maxbytes long default=-4
 
 ## Include visits in the cache, if the visitoperation allows it.
 ## This will enable another separate cache of summary.cache.maxbytes size.
+## IGNORED and DEPRECATED Will go away soon
 summary.cache.allowvisitcaching bool default=true
 
 ## Control number of cache entries preallocated.
 ## Default is no preallocation.
 ## Can be set to a higher number to avoid resizing.
+## IGNORED and DEPRECATED Will go away soon
 summary.cache.initialentries long default=0 restart
 
 ## Control compression type of the summary while in the cache.
@@ -252,6 +254,7 @@ summary.log.chunk.compression.level int default=9
 summary.log.chunk.maxbytes int default=65536
 
 ## Skip crc32 check on read.
+## IGNORED and DEPRECATED Will go away soon
 summary.log.chunk.skipcrconread bool default=false
 
 ## Max size per summary file.
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
index 3b3c043d578..2c75f00a672 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
@@ -174,7 +174,7 @@ getStoreConfig(const ProtonConfig::Summary::Cache & cache, const HwInfo & hwInfo
     size_t maxBytes = (cache.maxbytes < 0)
                       ? (hwInfo.memory().sizeBytes()*std::min(INT64_C(50), -cache.maxbytes))/100l
                       : cache.maxbytes;
-    return DocumentStore::Config(deriveCompression(cache.compression), maxBytes, cache.initialentries)
+    return DocumentStore::Config(deriveCompression(cache.compression), maxBytes)
             .updateStrategy(derive(cache.updateStrategy));
 }
 
@@ -189,7 +189,7 @@ deriveConfig(const ProtonConfig::Summary & summary, const HwInfo & hwInfo) {
             .setMaxNumLids(log.maxnumlids)
             .setMaxBucketSpread(log.maxbucketspread).setMinFileSizeFactor(log.minfilesizefactor)
             .compactCompression(deriveCompression(log.compact.compression))
-            .setFileConfig(fileConfig).disableCrcOnRead(chunk.skipcrconread);
+            .setFileConfig(fileConfig);
     return {config, logConfig};
 }