GC unused config

7 files changed, 2 insertions, 53 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
index c0b0ec3943d..123048c1638 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
@@ -3,10 +3,8 @@ package com.yahoo.vespa.model.content;
 
 import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.config.model.producer.AnyConfigProducer;
 import com.yahoo.config.model.producer.TreeConfigProducer;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
-import com.yahoo.vespa.config.content.core.StorBucketmoverConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
@@ -21,7 +19,7 @@ import java.util.Optional;
 /**
  * Class to provide config related to a specific storage node.
  */
-@RestartConfigs({StorFilestorConfig.class, StorBucketmoverConfig.class})
+@RestartConfigs({StorFilestorConfig.class})
 public class StorageNode extends ContentNode implements StorServerConfig.Producer, StorFilestorConfig.Producer {
 
     static final String rootFolder = Defaults.getDefaults().underVespaHome("var/db/vespa/search/");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
index a1e809098f2..28698c2f0ce 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.model.content.storagecluster;
 import ai.vespa.metrics.StorageMetrics;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.vespa.config.content.core.StorIntegritycheckerConfig;
-import com.yahoo.vespa.config.content.core.StorBucketmoverConfig;
 import com.yahoo.vespa.config.content.core.StorVisitorConfig;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
@@ -23,7 +22,6 @@ import org.w3c.dom.Element;
  */
 public class StorageCluster extends TreeConfigProducer<StorageNode>
     implements StorServerConfig.Producer,
-        StorBucketmoverConfig.Producer,
         StorIntegritycheckerConfig.Producer,
         StorFilestorConfig.Producer,
         StorVisitorConfig.Producer,
@@ -70,10 +68,6 @@ public class StorageCluster extends TreeConfigProducer<StorageNode>
     }
 
     @Override
-    public void getConfig(StorBucketmoverConfig.Builder builder) {
-    }
-
-    @Override
     public void getConfig(MetricsmanagerConfig.Builder builder) {
         ContentCluster.getMetricBuilder("fleetcontroller", builder).
                 addedmetrics(StorageMetrics.VDS_DATASTORED_ALLDISKS_DOCS.baseName()).
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index 53da4d31488..e49eed1eaa0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -10,7 +10,6 @@ import com.yahoo.config.provision.NodeResources;
 import com.yahoo.metrics.MetricsmanagerConfig;
 import com.yahoo.searchlib.TranslogserverConfig;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
-import com.yahoo.vespa.config.content.core.StorBucketmoverConfig;
 import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.config.content.core.StorStatusConfig;
@@ -44,8 +43,7 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults;
  * @author hmusum
  */
 @RestartConfigs({ProtonConfig.class, MetricsmanagerConfig.class, TranslogserverConfig.class,
-                 StorFilestorConfig.class, StorBucketmoverConfig.class,
-                 StorCommunicationmanagerConfig.class, StorStatusConfig.class,
+                 StorFilestorConfig.class, StorCommunicationmanagerConfig.class, StorStatusConfig.class,
                  StorServerConfig.class})
 public class SearchNode extends AbstractService implements
         SearchInterface,
diff --git a/storage/src/tests/common/testhelper.cpp b/storage/src/tests/common/testhelper.cpp
index 8580ba8a8d2..0aef61ad306 100644
--- a/storage/src/tests/common/testhelper.cpp
+++ b/storage/src/tests/common/testhelper.cpp
@@ -82,7 +82,6 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode, const std::string & ro
     config->set("fail_disk_after_error_count", "0");
     config = &dc.addConfig("stor-bouncer");
     config = &dc.addConfig("stor-integritychecker");
-    config = &dc.addConfig("stor-bucketmover");
     config = &dc.addConfig("stor-messageforwarder");
     config = &dc.addConfig("stor-server");
     config->set("cluster_name", clusterName);
diff --git a/storage/src/vespa/storage/config/CMakeLists.txt b/storage/src/vespa/storage/config/CMakeLists.txt
index 58996592677..ada3cca45fb 100644
--- a/storage/src/vespa/storage/config/CMakeLists.txt
+++ b/storage/src/vespa/storage/config/CMakeLists.txt
@@ -20,8 +20,6 @@ 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-integritychecker.def)
 install_config_definition(stor-integritychecker.def vespa.config.content.core.stor-integritychecker.def)
-vespa_generate_config(storage_storageconfig stor-bucketmover.def)
-install_config_definition(stor-bucketmover.def vespa.config.content.core.stor-bucketmover.def)
 vespa_generate_config(storage_storageconfig stor-bouncer.def)
 install_config_definition(stor-bouncer.def vespa.config.content.core.stor-bouncer.def)
 vespa_generate_config(storage_storageconfig stor-prioritymapping.def)
diff --git a/storage/src/vespa/storage/config/stor-bucketmover.def b/storage/src/vespa/storage/config/stor-bucketmover.def
deleted file mode 100644
index 80192c37ed7..00000000000
--- a/storage/src/vespa/storage/config/stor-bucketmover.def
+++ /dev/null
@@ -1,37 +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
-
-## Minimum time between bucket database iterations in the bucket mover. The
-## minumum time is used when disks starts to get pretty full and we have plenty
-## stuff we can move.
-## restart flag was added automatically and needs to be verified.
-minimum_recheck_interval_in_seconds int default=60 restart
-
-## Maximum time between bucket database iterations in the bucket mover. The
-## maximum time is used when disks have plenty free space, so moving data is
-## not critical.
-## restart flag was added automatically and needs to be verified.
-maximum_recheck_interval_in_seconds int default=3600 restart
-
-## Number of buckets to cache at a time when reading the bucket database
-## restart flag was added automatically and needs to be verified.
-bucket_iteration_chunk int default=1000 restart
-
-## Maximum fill rate above average fill rate for a target disk to be eligible
-## as a target for a bucket move operation.
-## restart flag was added automatically and needs to be verified.
-max_target_fill_rate_above_average double default=0.01 restart
-
-## Number of bucket mover runs to keep in history vector
-## restart flag was added automatically and needs to be verified.
-max_history_size int default=10 restart
-
-## Max concurrent pending bucket move operations scheduled in total.
-## restart flag was added automatically and needs to be verified.
-max_pending int default=5 restart
-
-## Operation delay. If set, the bucket mover will wait for this amount of
-## milliseconds between each operation. Useful in testing to make move run go
-## slow enough to view without that much data.
-## restart flag was added automatically and needs to be verified.
-operation_delay int default=0 restart
diff --git a/storageserver/src/tests/testhelper.cpp b/storageserver/src/tests/testhelper.cpp
index f36253ce9d3..4615404bf83 100644
--- a/storageserver/src/tests/testhelper.cpp
+++ b/storageserver/src/tests/testhelper.cpp
@@ -62,7 +62,6 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) {
     config->set("revert_time_period", "2000000000");
     config = &dc.addConfig("stor-bouncer");
     config = &dc.addConfig("stor-integritychecker");
-    config = &dc.addConfig("stor-bucketmover");
     config = &dc.addConfig("stor-messageforwarder");
     config = &dc.addConfig("stor-server");
     config->set("enable_dead_lock_detector", "false");