GC unused DocumentDBMaintenanceConfig

5 files changed, 9 insertions, 15 deletions

diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
index 915402122b8..23e96ae78d1 100644
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
@@ -842,7 +842,7 @@ void
 MaintenanceControllerFixture::performStartMaintenance()
 {
     injectMaintenanceJobs();
-    _mc.start(_mcCfg);
+    _mc.start();
 }
 
 
@@ -867,7 +867,7 @@ MaintenanceControllerFixture::performForwardMaintenanceConfig()
 {
     _mc.killJobs();
     injectMaintenanceJobs();
-    _mc.newConfig(_mcCfg);
+    _mc.newConfig();
 }
 
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index e4d432bf4fd..334d6891cd2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -983,7 +983,7 @@ DocumentDB::performStartMaintenance()
     }
     auto maintenanceConfig = activeConfig->getMaintenanceConfigSP();
     injectMaintenanceJobs(*maintenanceConfig);
-    _maintenanceController.start(maintenanceConfig);
+    _maintenanceController.start();
 }
 
 void
@@ -1003,7 +1003,7 @@ DocumentDB::forwardMaintenanceConfig()
         if (_maintenanceController.getPaused()) {
             injectMaintenanceJobs(*maintenanceConfig);
         }
-        _maintenanceController.newConfig(maintenanceConfig);
+        _maintenanceController.newConfig();
     }
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
index 29a25069367..bec1b88c0c9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
@@ -54,6 +54,7 @@ class ITransientResourceUsageProvider;
 class ReplayThrottlingPolicy;
 class StatusReport;
 struct MetricsWireService;
+class DocumentDBMaintenanceConfig;
 
 namespace matching { class SessionManager; }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp
index 5ca47d4d800..2688db36659 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp
@@ -2,7 +2,6 @@
 
 #include "maintenancecontroller.h"
 #include "maintenancejobrunner.h"
-#include "document_db_maintenance_config.h"
 #include "i_blockable_maintenance_job.h"
 #include <vespa/searchcorespi/index/i_thread_service.h>
 #include <vespa/searchcore/proton/common/scheduledexecutor.h>
@@ -52,7 +51,6 @@ MaintenanceController::MaintenanceController(FNET_Transport & transport,
       _remSubDB(),
       _notReadySubDB(),
       _periodicTimer(std::make_unique<ScheduledExecutor>(transport)),
-      _config(),
       _state(State::INITIALIZING),
       _docTypeName(docTypeName),
       _jobs(),
@@ -157,11 +155,10 @@ MaintenanceController::kill()
 }
 
 void
-MaintenanceController::start(const DocumentDBMaintenanceConfig::SP &config)
+MaintenanceController::start()
 {
     // Called by master write thread
     assert(_state == State::INITIALIZING);
-    _config = config;
     _state = State::STARTED;
     restart();
 }
@@ -197,10 +194,9 @@ MaintenanceController::addJobsToPeriodicTimer()
 }
 
 void
-MaintenanceController::newConfig(const DocumentDBMaintenanceConfig::SP &config)
+MaintenanceController::newConfig()
 {
     // Called by master write thread
-    _config = config;
     restart();
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h
index 763225045b2..b4182c254f5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h
@@ -25,7 +25,6 @@ namespace searchcorespi::index {
 namespace proton {
 
 class MaintenanceJobRunner;
-class DocumentDBMaintenanceConfig;
 class ScheduledExecutor;
 
 /**
@@ -38,7 +37,6 @@ class MaintenanceController
 public:
     using IThreadService = searchcorespi::index::IThreadService;
     using ISyncableThreadService = searchcorespi::index::ISyncableThreadService;
-    using DocumentDBMaintenanceConfigSP = std::shared_ptr<DocumentDBMaintenanceConfig>;
     using JobList = std::vector<std::shared_ptr<MaintenanceJobRunner>>;
     using UP = std::unique_ptr<MaintenanceController>;
     enum class State {INITIALIZING, STARTED, PAUSED, STOPPING};
@@ -58,8 +56,8 @@ public:
     }
 
     void stop();
-    void start(const DocumentDBMaintenanceConfigSP &config);
-    void newConfig(const DocumentDBMaintenanceConfigSP &config);
+    void start();
+    void newConfig();
     void updateMetrics(DocumentDBTaggedMetrics & metrics);
 
     void
@@ -90,7 +88,6 @@ private:
     MaintenanceDocumentSubDB          _remSubDB;
     MaintenanceDocumentSubDB          _notReadySubDB;
     std::unique_ptr<ScheduledExecutor>  _periodicTimer;
-    DocumentDBMaintenanceConfigSP     _config;
     State                             _state;
     const DocTypeName                &_docTypeName;
     JobList                           _jobs;