Wire in the real clcok and use an explicit RequestContext instead of the dummy FakeRequestContext intended only for tests.

9 files changed, 29 insertions, 8 deletions

diff --git a/searchcore/src/tests/proton/documentdb/executor_threading_service/executor_threading_service_test.cpp b/searchcore/src/tests/proton/documentdb/executor_threading_service/executor_threading_service_test.cpp
index 934dcdb36e3..46a6419e924 100644
--- a/searchcore/src/tests/proton/documentdb/executor_threading_service/executor_threading_service_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/executor_threading_service/executor_threading_service_test.cpp
@@ -33,6 +33,7 @@ public:
     void setup(uint32_t indexing_threads, SharedFieldWriterExecutor shared_field_writer) {
         service = std::make_unique<ExecutorThreadingService>(_transport.shared(),
                                                              _transport.transport(),
+                                                             _transport.clock(),
                                                              field_writer_executor.get(),
                                                              nullptr,
                                                              ThreadingServiceConfig::make(indexing_threads, shared_field_writer));
diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
index 38314abd7e5..1b04415b78f 100644
--- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp
+++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
@@ -18,6 +18,7 @@
 #include <vespa/vespalib/util/destructor_callbacks.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/size_literals.h>
+#include <vespa/searchlib/queryeval/fake_requestcontext.h>
 #include <set>
 
 using document::Document;
diff --git a/searchcore/src/tests/proton/index/indexcollection_test.cpp b/searchcore/src/tests/proton/index/indexcollection_test.cpp
index 70141f057bf..6f6fe3d4e41 100644
--- a/searchcore/src/tests/proton/index/indexcollection_test.cpp
+++ b/searchcore/src/tests/proton/index/indexcollection_test.cpp
@@ -5,7 +5,7 @@
 #include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
-
+#include <vespa/vespalib/util/testclock.h>
 #include <vespa/log/log.h>
 LOG_SETUP("indexcollection_test");
 
@@ -43,6 +43,7 @@ public:
     std::shared_ptr<IndexSearchable> _source2;
     std::shared_ptr<IndexSearchable> _fusion_source;
     vespalib::ThreadStackExecutor    _executor;
+    vespalib::TestClock              _clock;
     std::shared_ptr<IndexSearchable> _warmup;
 
     void expect_searchable_can_be_appended(IndexCollection::UP collection) {
@@ -76,7 +77,7 @@ public:
     }
 
     IndexCollection::UP create_warmup(const IndexCollection::SP& prev, const IndexCollection::SP& next) {
-        return std::make_unique<WarmupIndexCollection>(WarmupConfig(1s, false), prev, next, *_warmup, _executor, *this);
+        return std::make_unique<WarmupIndexCollection>(WarmupConfig(1s, false), prev, next, *_warmup, _executor, _clock.clock(), *this);
     }
 
     void warmupDone(std::shared_ptr<WarmupIndexCollection> current) override {
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index 37a17fecfc1..e4d75085027 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -186,7 +186,7 @@ DocumentDB::DocumentDB(const vespalib::string &baseDir,
       _baseDir(baseDir + "/" + _docTypeName.toString()),
       // Only one thread per executor, or performDropFeedView() will fail.
       _writeServiceConfig(configSnapshot->get_threading_service_config()),
-      _writeService(shared_service.shared(), shared_service.transport(), shared_service.field_writer(),
+      _writeService(shared_service.shared(), shared_service.transport(), shared_service.clock(), shared_service.field_writer(),
                     &shared_service.invokeService(), _writeServiceConfig, indexing_thread_stack_size),
       _initializeThreads(std::move(initializeThreads)),
       _initConfigSnapshot(),
diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
index d6ecc6dd2d3..dd735c75d79 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
@@ -41,12 +41,14 @@ VESPA_THREAD_STACK_TAG(field_writer_executor)
 
 }
 
-ExecutorThreadingService::ExecutorThreadingService(vespalib::Executor &sharedExecutor, FNET_Transport & transport, uint32_t num_treads)
-    : ExecutorThreadingService(sharedExecutor, transport, nullptr, nullptr, ThreadingServiceConfig::make(num_treads))
+ExecutorThreadingService::ExecutorThreadingService(vespalib::Executor &sharedExecutor, FNET_Transport & transport,
+                                                   const vespalib::Clock & clock, uint32_t num_treads)
+    : ExecutorThreadingService(sharedExecutor, transport, clock, nullptr, nullptr, ThreadingServiceConfig::make(num_treads))
 {}
 
 ExecutorThreadingService::ExecutorThreadingService(vespalib::Executor & sharedExecutor,
                                                    FNET_Transport & transport,
+                                                   const vespalib::Clock & clock,
                                                    vespalib::ISequencedTaskExecutor * field_writer,
                                                    vespalib::InvokeService * invokerService,
                                                    const ThreadingServiceConfig & cfg,
@@ -54,6 +56,7 @@ ExecutorThreadingService::ExecutorThreadingService(vespalib::Executor & sharedEx
 
     : _sharedExecutor(sharedExecutor),
       _transport(transport),
+      _clock(clock),
       _masterExecutor(1, stackSize, CpuUsage::wrap(master_executor, CpuUsage::Category::WRITE)),
       _shared_field_writer(cfg.shared_field_writer()),
       _master_task_limit(cfg.master_task_limit()),
diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h
index 77bb9042198..1179c88ef76 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h
+++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h
@@ -22,6 +22,7 @@ private:
     using Registration = std::unique_ptr<vespalib::IDestructorCallback>;
     vespalib::Executor                                 & _sharedExecutor;
     FNET_Transport                                     & _transport;
+    const vespalib::Clock                              & _clock;
     vespalib::ThreadStackExecutor                        _masterExecutor;
     ThreadingServiceConfig::SharedFieldWriterExecutor    _shared_field_writer;
     std::atomic<uint32_t>                                _master_task_limit;
@@ -43,10 +44,12 @@ public:
     /**
      * Convenience constructor used in unit tests.
      */
-    ExecutorThreadingService(vespalib::Executor& sharedExecutor, FNET_Transport & transport, uint32_t num_treads = 1);
+    ExecutorThreadingService(vespalib::Executor& sharedExecutor, FNET_Transport & transport,
+                             const vespalib::Clock & clock, uint32_t num_treads = 1);
 
     ExecutorThreadingService(vespalib::Executor& sharedExecutor,
                              FNET_Transport & transport,
+                             const vespalib::Clock & clock,
                              vespalib::ISequencedTaskExecutor* field_writer,
                              vespalib::InvokeService * invokeService,
                              const ThreadingServiceConfig& cfg,
@@ -82,6 +85,7 @@ public:
     vespalib::ISequencedTaskExecutor &indexFieldWriter() override;
     vespalib::ISequencedTaskExecutor &attributeFieldWriter() override;
     FNET_Transport &transport() override { return _transport; }
+    const vespalib::Clock &clock() const override { return _clock; }
     ExecutorThreadingServiceStats getStats();
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h b/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h
index f728ab5f025..16b466a2275 100644
--- a/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h
+++ b/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h
@@ -50,6 +50,7 @@ public:
         return _shared;
     }
     FNET_Transport & transport() override { return _service.transport(); }
+    const vespalib::Clock & clock() const override { return _service.clock(); }
     vespalib::ISequencedTaskExecutor &indexFieldInverter() override {
         return _indexFieldInverter;
     }
diff --git a/searchcore/src/vespa/searchcore/proton/test/transport_helper.cpp b/searchcore/src/vespa/searchcore/proton/test/transport_helper.cpp
index 43e267805da..0731a3429b1 100644
--- a/searchcore/src/vespa/searchcore/proton/test/transport_helper.cpp
+++ b/searchcore/src/vespa/searchcore/proton/test/transport_helper.cpp
@@ -5,13 +5,15 @@
 #include <vespa/fastos/thread.h>
 #include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
+#include <vespa/vespalib/util/testclock.h>
 #include <vespa/searchcore/proton/server/executorthreadingservice.h>
 
 namespace proton {
 
 Transport::Transport()
     : _threadPool(std::make_unique<FastOS_ThreadPool>(64_Ki)),
-      _transport(std::make_unique<FNET_Transport>())
+      _transport(std::make_unique<FNET_Transport>()),
+      _clock(std::make_unique<vespalib::TestClock>())
 {
     _transport->Start(_threadPool.get());
 }
@@ -20,6 +22,10 @@ Transport::~Transport() {
     shutdown();
 }
 
+const vespalib::Clock &
+Transport::clock() const {
+    return _clock->clock();
+}
 void
 Transport::shutdown() {
     _transport->ShutDown(true);
@@ -39,7 +45,7 @@ TransportAndExecutor::shutdown() {
 
 TransportAndExecutorService::TransportAndExecutorService(size_t num_threads)
     : TransportAndExecutor(num_threads),
-      _writeService(std::make_unique<ExecutorThreadingService>(shared(), transport()))
+      _writeService(std::make_unique<ExecutorThreadingService>(shared(), transport(), clock()))
 {}
 TransportAndExecutorService::~TransportAndExecutorService() = default;
 
diff --git a/searchcore/src/vespa/searchcore/proton/test/transport_helper.h b/searchcore/src/vespa/searchcore/proton/test/transport_helper.h
index 81610193743..8ec4f50e3f0 100644
--- a/searchcore/src/vespa/searchcore/proton/test/transport_helper.h
+++ b/searchcore/src/vespa/searchcore/proton/test/transport_helper.h
@@ -5,6 +5,8 @@
 
 class FastOS_ThreadPool;
 
+namespace vespalib { class TestClock; }
+
 namespace proton {
 
 class ExecutorThreadingService;
@@ -18,10 +20,12 @@ public:
     virtual ~Transport();
     FNET_Transport & transport() { return *_transport; }
     FastOS_ThreadPool & threadPool() { return *_threadPool; }
+    const vespalib::Clock & clock() const;
     virtual void shutdown();
 private:
     std::unique_ptr<FastOS_ThreadPool> _threadPool;
     std::unique_ptr<FNET_Transport>    _transport;
+    std::unique_ptr<vespalib::TestClock>   _clock;
 };
 
 class TransportAndExecutor : public Transport {