diff options
| -rw-r--r-- | searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp | 5 | ||||
| -rw-r--r-- | storage/src/tests/common/testhelper.cpp | 1 | ||||
| -rw-r--r-- | storage/src/vespa/storage/bucketdb/.gitignore | 2 | ||||
| -rw-r--r-- | storage/src/vespa/storage/bucketdb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/src/vespa/storage/bucketdb/stor-bucket-init.def | 35 | ||||
| -rw-r--r-- | storageserver/src/tests/testhelper.cpp | 1 |
6 files changed, 0 insertions, 46 deletions
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp index 9d86b2d28e1..7df116a5f0c 100644 --- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp +++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp @@ -30,7 +30,6 @@ #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/transactionlog/translogserver.h> #include <vespa/searchsummary/config/config-juniperrc.h> -#include <vespa/storage/bucketdb/config-stor-bucket-init.h> #include <vespa/storage/common/i_storage_chain_builder.h> #include <vespa/storage/config/config-stor-bouncer.h> #include <vespa/storage/config/config-stor-communicationmanager.h> @@ -103,7 +102,6 @@ using vespa::config::content::UpgradingConfigBuilder; using vespa::config::content::core::BucketspacesConfig; using vespa::config::content::core::BucketspacesConfigBuilder; using vespa::config::content::core::StorBouncerConfigBuilder; -using vespa::config::content::core::StorBucketInitConfigBuilder; using vespa::config::content::core::StorCommunicationmanagerConfigBuilder; using vespa::config::content::core::StorDistributormanagerConfigBuilder; using vespa::config::content::core::StorOpsloggerConfigBuilder; @@ -355,7 +353,6 @@ struct ServiceLayerConfigSet : public StorageConfigSet { PersistenceConfigBuilder persistence; StorFilestorConfigBuilder stor_filestor; - StorBucketInitConfigBuilder stor_bucket_init; StorVisitorConfigBuilder stor_visitor; ServiceLayerConfigSet(const vespalib::string& base_dir, uint32_t node_idx, const vespalib::string& config_id_in, const IBmDistribution& distribution, const DocumenttypesConfig& documenttypes_in, @@ -363,7 +360,6 @@ struct ServiceLayerConfigSet : public StorageConfigSet : StorageConfigSet(base_dir, node_idx, false, config_id_in, distribution, documenttypes_in, slobrok_port, mbus_port, rpc_port, status_port, params), persistence(), stor_filestor(), - stor_bucket_init(), stor_visitor() { stor_filestor.numResponseThreads = params.get_response_threads(); @@ -377,7 +373,6 @@ struct ServiceLayerConfigSet : public StorageConfigSet StorageConfigSet::add_builders(set); set.addBuilder(config_id, &persistence); set.addBuilder(config_id, &stor_filestor); - set.addBuilder(config_id, &stor_bucket_init); set.addBuilder(config_id, &stor_visitor); } }; diff --git a/storage/src/tests/common/testhelper.cpp b/storage/src/tests/common/testhelper.cpp index 0f0a7cd8b55..1aecd72172a 100644 --- a/storage/src/tests/common/testhelper.cpp +++ b/storage/src/tests/common/testhelper.cpp @@ -48,7 +48,6 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode, const std::string & ro config = &dc.addConfig("messagebus"); config = &dc.addConfig("stor-prioritymapping"); config = &dc.addConfig("stor-bucketdbupdater"); - config = &dc.addConfig("stor-bucket-init"); config = &dc.addConfig("metricsmanager"); config->set("consumer[2]"); config->set("consumer[0].name", "\"status\""); diff --git a/storage/src/vespa/storage/bucketdb/.gitignore b/storage/src/vespa/storage/bucketdb/.gitignore index 54d8faa8201..3df72b601a2 100644 --- a/storage/src/vespa/storage/bucketdb/.gitignore +++ b/storage/src/vespa/storage/bucketdb/.gitignore @@ -7,5 +7,3 @@ .libs Makefile config-stor-bucketdb.* -/config-stor-bucket-init.h -/config-stor-bucket-init.cpp diff --git a/storage/src/vespa/storage/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/bucketdb/CMakeLists.txt index fe60426325c..b16795a90ba 100644 --- a/storage/src/vespa/storage/bucketdb/CMakeLists.txt +++ b/storage/src/vespa/storage/bucketdb/CMakeLists.txt @@ -15,5 +15,3 @@ vespa_add_library(storage_bucketdb OBJECT ) vespa_generate_config(storage_bucketdb stor-bucketdb.def) install_config_definition(stor-bucketdb.def vespa.config.content.core.stor-bucketdb.def) -vespa_generate_config(storage_bucketdb stor-bucket-init.def) -install_config_definition(stor-bucket-init.def vespa.config.content.core.stor-bucket-init.def) diff --git a/storage/src/vespa/storage/bucketdb/stor-bucket-init.def b/storage/src/vespa/storage/bucketdb/stor-bucket-init.def deleted file mode 100644 index c3344e324a5..00000000000 --- a/storage/src/vespa/storage/bucketdb/stor-bucket-init.def +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=vespa.config.content.core - -# The maximum number of alien files found during init that should be stored in -# memory so they can be viewed on status page. -max_alien_files_logged int default=10 restart - -# The maximum number of pending info reads to each disk during initialization. -max_pending_info_reads_per_disk int default=20 restart - -# The minimum number of pending info reads to each disk during initialization. -# When pending falls below this, we will resume database scan to add more -# pending up to the maximum setting. -min_pending_info_reads_per_disk int default=4 restart - -# The priority of the read bucket info requests the initializer sends to the -# persistence layer. Currently chosen so that such operations will not pre- -# empt any regular external load or ideal state operations, but they will block -# very low priority background operations such as periodic GC (default pri of -# 200). A tradeoff must be made between fast initialization and the availability -# of data on the initializing node. -info_read_priority int default=185 restart - -# The priority of the list bucket requests the initializer sends to the -# persistence layer. Should always be lower than the read priority to ensure -# starting to read wont make listing wait. However, listing is currently pretty -# much required to be done before starting anyhow, so this option does little -# unless your directories are not hardware independent. -list_priority int default=100 restart - -# Whether the initializer should complete listing before starting to read -# bucket information. Shouldnt matter much performance wise so always set to -# true as it is now. Setting it false, disks done listing first will start -# to process info requests a bit earlier than otherwise. -complete_list_before_starting_read bool default=false restart diff --git a/storageserver/src/tests/testhelper.cpp b/storageserver/src/tests/testhelper.cpp index ed9597e3160..73a9938e4c5 100644 --- a/storageserver/src/tests/testhelper.cpp +++ b/storageserver/src/tests/testhelper.cpp @@ -33,7 +33,6 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) { config = &dc.addConfig("messagebus"); config = &dc.addConfig("stor-prioritymapping"); config = &dc.addConfig("stor-bucketdbupdater"); - config = &dc.addConfig("stor-bucket-init"); config = &dc.addConfig("metricsmanager"); config->set("consumer[1]"); config->set("consumer[0].name", "\"status\""); |