GC stor-integritychecker config

6 files changed, 0 insertions, 111 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java
deleted file mode 100644
index 4f81bbf165f..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.content.storagecluster;
-
-import com.yahoo.vespa.config.content.core.StorIntegritycheckerConfig;
-import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
-import com.yahoo.vespa.model.content.cluster.ContentCluster;
-
-/**
- * Serves stor-integritychecker config for storage clusters.
- */
-public class IntegrityCheckerProducer implements StorIntegritycheckerConfig.Producer {
-
-    public static class Builder {
-        protected IntegrityCheckerProducer build(ContentCluster cluster, ModelElement clusterElem) {
-                return integrityCheckerDisabled();
-        }
-    }
-
-    private final Integer startTime;
-    private final Integer stopTime;
-    private final String weeklyCycle;
-
-    IntegrityCheckerProducer(Integer startTime, Integer stopTime, String weeklyCycle) {
-        this.startTime = startTime;
-        this.stopTime = stopTime;
-        this.weeklyCycle = weeklyCycle;
-    }
-
-    private static IntegrityCheckerProducer integrityCheckerDisabled() {
-        // Leave start/start times at default, but mark each day of the week as
-        // not allowing the integrity checker to be run.
-        return new IntegrityCheckerProducer(null, null, "-------");
-    }
-
-    @Override
-    public void getConfig(StorIntegritycheckerConfig.Builder builder) {
-        if (startTime != null) {
-            builder.dailycyclestart(startTime);
-        }
-
-        if (stopTime != null) {
-            builder.dailycyclestop(stopTime);
-        }
-
-        if (weeklyCycle != null) {
-            builder.weeklycycle(weeklyCycle);
-        }
-    }
-}
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 28698c2f0ce..872fda9d909 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
@@ -3,7 +3,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.StorVisitorConfig;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
@@ -22,7 +21,6 @@ import org.w3c.dom.Element;
  */
 public class StorageCluster extends TreeConfigProducer<StorageNode>
     implements StorServerConfig.Producer,
-        StorIntegritycheckerConfig.Producer,
         StorFilestorConfig.Producer,
         StorVisitorConfig.Producer,
         PersistenceConfig.Producer,
@@ -37,7 +35,6 @@ public class StorageCluster extends TreeConfigProducer<StorageNode>
             return new StorageCluster(ancestor,
                                       ContentCluster.getClusterId(clusterElem),
                                       new FileStorProducer.Builder().build(deployState.getProperties(), cluster, clusterElem),
-                                      new IntegrityCheckerProducer.Builder().build(cluster, clusterElem),
                                       new StorServerProducer.Builder().build(clusterElem),
                                       new StorVisitorProducer.Builder().build(clusterElem),
                                       new PersistenceProducer.Builder().build(clusterElem));
@@ -46,7 +43,6 @@ public class StorageCluster extends TreeConfigProducer<StorageNode>
 
     private final String clusterName;
     private final FileStorProducer fileStorProducer;
-    private final IntegrityCheckerProducer integrityCheckerProducer;
     private final StorServerProducer storServerProducer;
     private final StorVisitorProducer storVisitorProducer;
     private final PersistenceProducer persistenceProducer;
@@ -54,14 +50,12 @@ public class StorageCluster extends TreeConfigProducer<StorageNode>
     StorageCluster(TreeConfigProducer<?> parent,
                    String clusterName,
                    FileStorProducer fileStorProducer,
-                   IntegrityCheckerProducer integrityCheckerProducer,
                    StorServerProducer storServerProducer,
                    StorVisitorProducer storVisitorProducer,
                    PersistenceProducer persistenceProducer) {
         super(parent, "storage");
         this.clusterName = clusterName;
         this.fileStorProducer = fileStorProducer;
-        this.integrityCheckerProducer = integrityCheckerProducer;
         this.storServerProducer = storServerProducer;
         this.storVisitorProducer = storVisitorProducer;
         this.persistenceProducer = persistenceProducer;
@@ -95,11 +89,6 @@ public class StorageCluster extends TreeConfigProducer<StorageNode>
     }
 
     @Override
-    public void getConfig(StorIntegritycheckerConfig.Builder builder) {
-        integrityCheckerProducer.getConfig(builder);
-    }
-
-    @Override
     public void getConfig(StorServerConfig.Builder builder) {
         storServerProducer.getConfig(builder);
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index 540f625cf2b..2404c6399eb 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -9,7 +9,6 @@ import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provisioning.FlavorsConfig;
 import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig;
-import com.yahoo.vespa.config.content.core.StorIntegritycheckerConfig;
 import com.yahoo.vespa.config.content.core.StorVisitorConfig;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
@@ -327,15 +326,6 @@ public class StorageClusterTest {
     }
 
     @Test
-    void integrity_checker_explicitly_disabled_when_not_running_with_vds_provider() {
-        StorIntegritycheckerConfig.Builder builder = new StorIntegritycheckerConfig.Builder();
-        parse(cluster("bees", "")).getConfig(builder);
-        StorIntegritycheckerConfig config = new StorIntegritycheckerConfig(builder);
-        // '-' --> don't run on the given week day
-        assertEquals("-------", config.weeklycycle());
-    }
-
-    @Test
     void testCapacity() {
         String xml = joinLines(
                 "<cluster id=\"storage\">",
diff --git a/storage/src/tests/common/testhelper.cpp b/storage/src/tests/common/testhelper.cpp
index 0aef61ad306..bbaf131f3ba 100644
--- a/storage/src/tests/common/testhelper.cpp
+++ b/storage/src/tests/common/testhelper.cpp
@@ -81,7 +81,6 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode, const std::string & ro
     // Don't want test to call exit()
     config->set("fail_disk_after_error_count", "0");
     config = &dc.addConfig("stor-bouncer");
-    config = &dc.addConfig("stor-integritychecker");
     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 ada3cca45fb..089b86b2a2c 100644
--- a/storage/src/vespa/storage/config/CMakeLists.txt
+++ b/storage/src/vespa/storage/config/CMakeLists.txt
@@ -18,8 +18,6 @@ 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-integritychecker.def)
-install_config_definition(stor-integritychecker.def vespa.config.content.core.stor-integritychecker.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-integritychecker.def b/storage/src/vespa/storage/config/stor-integritychecker.def
deleted file mode 100644
index 80685cbb58f..00000000000
--- a/storage/src/vespa/storage/config/stor-integritychecker.def
+++ /dev/null
@@ -1,38 +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
-
-## Minutes after midnight when integrity checker is allowed to start running.
-## 0 means it will start/continue run at midnight. 
-dailycyclestart int default=0
-
-## Minutes after midnight when integrity checker is not allowed to run anymore.
-## If this equals dailycyclestart it is allowed to run all day. dailycyclestop
-## is allowed to be less than dailycyclestart.
-dailycyclestop int default=0
-
-## Status of what is allowed done on what weekdays. Should be a string with
-## seven characters, where the first represent sunday, the seventh saturday.
-## The possible options are RrCc- which means:
-##  R - If state becomes R, and current cycle does not verify file content,
-##      abort current cycle, otherwise continue it. Start new cycle verifying
-##      all content of all files.
-##  r - Continue current cycle. Start new cycle using cheap partial file
-##      verification.
-##  c - Continue current cycle. Dont start a new cycle.
-weeklycycle string default="Rrrrrrr"
-
-## Max concurrent pending bucket verifications. For max speed, each disk thread
-## should have one to work with all the time. Default is 1, to ensure little
-## resources are consumed by this process by default. Once request priority
-## has been introduced, this default may become higher.
-maxpending int default=2
-
-## Minimum time since last cycle before starting a new one in minutes.
-## Defaults to 24 hours.
-mincycletime int default=1440
-
-## Minimum time in seconds between each request. To throttle the system even
-## slower if continuous one pending puts on more load on the system than you
-## want. Works with multiple pending messages, though it doesnt make much sense
-## unless maxpending equals 1.
-requestdelay int default=0