cleanup leftover code

2 files changed, 0 insertions, 32 deletions

diff --git a/configd/src/apps/sentinel/config-owner.cpp b/configd/src/apps/sentinel/config-owner.cpp
index 4042eded24e..665cf07d3e7 100644
--- a/configd/src/apps/sentinel/config-owner.cpp
+++ b/configd/src/apps/sentinel/config-owner.cpp
@@ -17,15 +17,6 @@ ConfigOwner::~ConfigOwner() = default;
 void
 ConfigOwner::subscribe(const std::string & configId, std::chrono::milliseconds timeout) {
     _sentinelHandle = _subscriber.subscribe<SentinelConfig>(configId, timeout);
-    try {
-        _modelHandle =_modelOwner.subscribe<ModelConfig>("admin/model", timeout);
-    } catch (ConfigTimeoutException & ex) {
-        LOG(warning, "Timeout getting model config: %s [skipping connectivity checks]", ex.getMessage().c_str());
-    } catch (InvalidConfigException& ex) {
-        LOG(warning, "Invalid model config: %s [skipping connectivity checks]", ex.getMessage().c_str());
-    } catch (ConfigRuntimeException& ex) {
-        LOG(warning, "Runtime exception getting model config: %s [skipping connectivity checks]", ex.getMessage().c_str());
-    }
 }
 
 void
@@ -38,7 +29,6 @@ ConfigOwner::doConfigure()
     const auto & app = config.application;
     LOG(config, "Sentinel got %zd service elements [tenant(%s), application(%s), instance(%s)] for config generation %" PRId64,
         config.service.size(), app.tenant.c_str(), app.name.c_str(), app.instance.c_str(), _currGeneration);
-    getModelConfig();
 }
 
 
@@ -52,20 +42,4 @@ ConfigOwner::checkForConfigUpdate() {
     return false;
 }
 
-std::optional<ModelConfig>
-ConfigOwner::getModelConfig() {
-    if (_modelHandle && _modelOwner.nextGenerationNow()) {
-        if (auto newModel = _modelHandle->getConfig()) {
-            LOG(config, "Sentinel got model info [version %s] for %zd hosts [config generation %" PRId64 "]",
-                newModel->vespaVersion.c_str(), newModel->hosts.size(), _modelOwner.getGeneration());
-            _modelConfig = std::move(newModel);
-        }
-    }
-    if (_modelConfig) {
-        return ModelConfig(*_modelConfig);
-    } else {
-        return {};
-    }
-}
-
 }
diff --git a/configd/src/apps/sentinel/config-owner.h b/configd/src/apps/sentinel/config-owner.h
index b27c515e357..1a8a0a74666 100644
--- a/configd/src/apps/sentinel/config-owner.h
+++ b/configd/src/apps/sentinel/config-owner.h
@@ -8,7 +8,6 @@
 #include <optional>
 
 using cloud::config::SentinelConfig;
-using cloud::config::ModelConfig;
 
 using config::ConfigSubscriber;
 using config::ConfigHandle;
@@ -26,10 +25,6 @@ private:
     int64_t _currGeneration = -1;
     std::unique_ptr<SentinelConfig> _currConfig;
 
-    ConfigSubscriber _modelOwner;
-    ConfigHandle<ModelConfig>::UP _modelHandle;
-    std::unique_ptr<ModelConfig> _modelConfig;
-
     ConfigOwner(const ConfigOwner&) = delete;
     ConfigOwner& operator =(const ConfigOwner&) = delete;
 
@@ -42,7 +37,6 @@ public:
     bool hasConfig() const { return _currConfig.get() != nullptr; }
     const SentinelConfig& getConfig() const { return *_currConfig; }
     int64_t getGeneration() const { return _currGeneration; }
-    std::optional<ModelConfig> getModelConfig();
 };
 
 }