GC unused stor-bucketdb and stor-opslogger config.

8 files changed, 0 insertions, 27 deletions

diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
index e3315399ed9..ede5728026e 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
@@ -34,7 +34,6 @@
 #include <vespa/storage/config/config-stor-bouncer.h>
 #include <vespa/storage/config/config-stor-communicationmanager.h>
 #include <vespa/storage/config/config-stor-distributormanager.h>
-#include <vespa/storage/config/config-stor-opslogger.h>
 #include <vespa/storage/config/config-stor-prioritymapping.h>
 #include <vespa/storage/config/config-stor-server.h>
 #include <vespa/storage/config/config-stor-status.h>
@@ -103,7 +102,6 @@ using vespa::config::content::core::BucketspacesConfigBuilder;
 using vespa::config::content::core::StorBouncerConfigBuilder;
 using vespa::config::content::core::StorCommunicationmanagerConfigBuilder;
 using vespa::config::content::core::StorDistributormanagerConfigBuilder;
-using vespa::config::content::core::StorOpsloggerConfigBuilder;
 using vespa::config::content::core::StorPrioritymappingConfigBuilder;
 using vespa::config::content::core::StorServerConfigBuilder;
 using vespa::config::content::core::StorStatusConfigBuilder;
@@ -275,7 +273,6 @@ struct StorageConfigSet
     StorDistributionConfigBuilder stor_distribution;
     StorBouncerConfigBuilder      stor_bouncer;
     StorCommunicationmanagerConfigBuilder stor_communicationmanager;
-    StorOpsloggerConfigBuilder    stor_opslogger;
     StorPrioritymappingConfigBuilder stor_prioritymapping;
     UpgradingConfigBuilder        upgrading;
     StorServerConfigBuilder       stor_server;
@@ -292,7 +289,6 @@ struct StorageConfigSet
           stor_distribution(),
           stor_bouncer(),
           stor_communicationmanager(),
-          stor_opslogger(),
           stor_prioritymapping(),
           upgrading(),
           stor_server(),
@@ -335,7 +331,6 @@ struct StorageConfigSet
         set.addBuilder(config_id, &stor_distribution);
         set.addBuilder(config_id, &stor_bouncer);
         set.addBuilder(config_id, &stor_communicationmanager);
-        set.addBuilder(config_id, &stor_opslogger);
         set.addBuilder(config_id, &stor_prioritymapping);
         set.addBuilder(config_id, &upgrading);
         set.addBuilder(config_id, &stor_server);
diff --git a/storage/src/tests/common/testhelper.cpp b/storage/src/tests/common/testhelper.cpp
index 7b8af42fd84..e396b81021c 100644
--- a/storage/src/tests/common/testhelper.cpp
+++ b/storage/src/tests/common/testhelper.cpp
@@ -59,7 +59,6 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode, const std::string & ro
     config = &dc.addConfig("stor-communicationmanager");
     config->set("rpcport", "0");
     config->set("mbusport", "0");
-    config = &dc.addConfig("stor-bucketdb");
     config->set("chunklevel", "0");
     config = &dc.addConfig("stor-distributormanager");
     config->set("splitcount", "1000");
@@ -67,7 +66,6 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode, const std::string & ro
     config->set("joincount", "500");
     config->set("joinsize", "5000000");
     config->set("max_clock_skew_sec", "0");
-    config = &dc.addConfig("stor-opslogger");
     config = &dc.addConfig("persistence");
     config->set("abort_operations_with_changed_bucket_ownership", "true");
     config = &dc.addConfig("stor-filestor");
diff --git a/storage/src/vespa/storage/bucketdb/.gitignore b/storage/src/vespa/storage/bucketdb/.gitignore
index 3df72b601a2..333f254ba10 100644
--- a/storage/src/vespa/storage/bucketdb/.gitignore
+++ b/storage/src/vespa/storage/bucketdb/.gitignore
@@ -6,4 +6,3 @@
 .deps
 .libs
 Makefile
-config-stor-bucketdb.*
diff --git a/storage/src/vespa/storage/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
index 0fc32f11583..f9f6220ec1e 100644
--- a/storage/src/vespa/storage/bucketdb/CMakeLists.txt
+++ b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
@@ -13,5 +13,3 @@ vespa_add_library(storage_bucketdb OBJECT
     striped_btree_lockable_map.cpp
     DEPENDS
 )
-vespa_generate_config(storage_bucketdb stor-bucketdb.def)
-install_config_definition(stor-bucketdb.def vespa.config.content.core.stor-bucketdb.def)
diff --git a/storage/src/vespa/storage/bucketdb/stor-bucketdb.def b/storage/src/vespa/storage/bucketdb/stor-bucketdb.def
deleted file mode 100644
index 16a0473fe4a..00000000000
--- a/storage/src/vespa/storage/bucketdb/stor-bucketdb.def
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=vespa.config.content.core
-
-## Number of elements to retrieve in one bucket info chunk
-bucketinfobatchsize int default=128 restart
-
-## Chunk level. Set what level of the path which defines one chunk.
-## (See doxygen info in bucketmanager.h for more info)
-chunklevel int default=1 restart
diff --git a/storage/src/vespa/storage/config/CMakeLists.txt b/storage/src/vespa/storage/config/CMakeLists.txt
index 8eaf4f359f4..670569ed598 100644
--- a/storage/src/vespa/storage/config/CMakeLists.txt
+++ b/storage/src/vespa/storage/config/CMakeLists.txt
@@ -12,8 +12,6 @@ vespa_generate_config(storage_storageconfig stor-server.def)
 install_config_definition(stor-server.def vespa.config.content.core.stor-server.def)
 vespa_generate_config(storage_storageconfig stor-status.def)
 install_config_definition(stor-status.def vespa.config.content.core.stor-status.def)
-vespa_generate_config(storage_storageconfig stor-opslogger.def)
-install_config_definition(stor-opslogger.def vespa.config.content.core.stor-opslogger.def)
 vespa_generate_config(storage_storageconfig stor-visitordispatcher.def)
 install_config_definition(stor-visitordispatcher.def vespa.config.content.core.stor-visitordispatcher.def)
 vespa_generate_config(storage_storageconfig stor-bouncer.def)
diff --git a/storage/src/vespa/storage/config/stor-opslogger.def b/storage/src/vespa/storage/config/stor-opslogger.def
deleted file mode 100644
index 40124b9ff03..00000000000
--- a/storage/src/vespa/storage/config/stor-opslogger.def
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=vespa.config.content.core
-
-targetfile string default="" restart
diff --git a/storageserver/src/tests/testhelper.cpp b/storageserver/src/tests/testhelper.cpp
index 6877ed9aba6..3b41253cfdd 100644
--- a/storageserver/src/tests/testhelper.cpp
+++ b/storageserver/src/tests/testhelper.cpp
@@ -41,10 +41,8 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) {
     config = &dc.addConfig("stor-communicationmanager");
     config->set("rpcport", "0");
     config->set("mbusport", "0");
-    config = &dc.addConfig("stor-bucketdb");
     config->set("chunklevel", "0");
     config = &dc.addConfig("stor-distributormanager");
-    config = &dc.addConfig("stor-opslogger");
     config = &dc.addConfig("stor-filestor");
     // Easier to see what goes wrong with only 1 thread per disk.
     config->set("threads[1]");