1 files changed, 4 insertions, 9 deletions
diff --git a/searchcore/src/vespa/searchcorespi/index/warmupindexcollection.cpp b/searchcore/src/vespa/searchcorespi/index/warmupindexcollection.cpp
index 5d5348de52a..49dcb5a1f54 100644
--- a/searchcore/src/vespa/searchcorespi/index/warmupindexcollection.cpp
+++ b/searchcore/src/vespa/searchcorespi/index/warmupindexcollection.cpp
@@ -35,9 +35,9 @@ class WarmupRequestContext : public IRequestContext {
     using IAttributeVector = search::attribute::IAttributeVector;
     using AttributeBlueprintParams = search::attribute::AttributeBlueprintParams;
 public:
-    explicit WarmupRequestContext(const vespalib::Clock & clock);
+    explicit WarmupRequestContext();
     ~WarmupRequestContext() override;
-    const vespalib::Doom & getDoom() const override { return _doom; }
+    const vespalib::Doom & getDoom() const override { return vespalib::Doom::never(); }
     vespalib::ThreadBundle & thread_bundle() const override { return vespalib::ThreadBundle::trivial(); }
     const IAttributeVector *getAttribute(const vespalib::string &) const override { return nullptr; }
     const IAttributeVector *getAttributeStableEnum(const vespalib::string &) const override { return nullptr; }
@@ -45,7 +45,6 @@ public:
     const AttributeBlueprintParams& get_attribute_blueprint_params() const override { return _params; }
     const MetaStoreReadGuardSP * getMetaStoreReadGuard() const override { return nullptr; }
 private:
-    const vespalib::Doom _doom;
     const AttributeBlueprintParams _params;
 };
 class WarmupTask : public vespalib::Executor::Task {
@@ -80,14 +79,12 @@ WarmupIndexCollection::WarmupIndexCollection(const WarmupConfig & warmupConfig,
                                              ISearchableIndexCollection::SP next,
                                              IndexSearchable & warmup,
                                              vespalib::Executor & executor,
-                                             const vespalib::Clock & clock,
                                              IWarmupDone & warmupDone) :
     _warmupConfig(warmupConfig),
     _prev(std::move(prev)),
     _next(std::move(next)),
     _warmup(warmup),
     _executor(executor),
-    _clock(clock),
     _warmupDone(warmupDone),
     _warmupEndTime(vespalib::steady_clock::now() + warmupConfig.getDuration()),
     _handledTerms(std::make_unique<FieldTermMap>()),
@@ -278,9 +275,7 @@ WarmupIndexCollection::drainPending() {
     _pendingTasks.waitForZeroRefCount();
 }
 
-WarmupRequestContext::WarmupRequestContext(const vespalib::Clock & clock)
-    : _doom(clock, vespalib::steady_time::max(), vespalib::steady_time::max(), false)
-{}
+WarmupRequestContext::WarmupRequestContext() = default;
 WarmupRequestContext::~WarmupRequestContext() = default;
 
 const vespalib::eval::Value*
@@ -292,7 +287,7 @@ WarmupTask::WarmupTask(std::unique_ptr<MatchData> md, std::shared_ptr<WarmupInde
       _retainGuard(_warmup->pendingTasks()),
       _matchData(std::move(md)),
       _bluePrint(),
-      _requestContext(_warmup->clock())
+      _requestContext()
 {
 }