summaryrefslogtreecommitdiffstats
path: root/storageserver
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-02-08 11:03:16 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2023-02-08 11:21:25 +0000
commit4fee638262bfed47bb690eea88cf4e776d633f42 (patch)
treea67266792eeb185b88de722e719ca63fc7cd0300 /storageserver
parente963d5ec9f95fd40e469d9cb67c25385d33d0675 (diff)
- Disconnect clock and MicroSecTime.
- GC unused functionality from clock/time.h - Unify on vespalib::steady_time/system_time/duration.
Diffstat (limited to 'storageserver')
-rw-r--r--storageserver/src/vespa/storageserver/app/distributorprocess.cpp3
-rw-r--r--storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
index 7e65ff68601..987b3b613d8 100644
--- a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
@@ -5,6 +5,7 @@
#include <vespa/storage/common/bucket_stripe_utils.h>
#include <vespa/storage/common/i_storage_chain_builder.h>
#include <vespa/storage/common/storagelink.h>
+#include <vespa/storageframework/defaultimplementation/clock/realclock.h>
#include <thread>
#include <vespa/log/log.h>
@@ -14,7 +15,7 @@ namespace storage {
DistributorProcess::DistributorProcess(const config::ConfigUri & configUri)
: Process(configUri),
- _context(),
+ _context(std::make_unique<framework::defaultimplementation::RealClock>()),
_num_distributor_stripes(0), // TODO STRIPE: change default when legacy single stripe mode is removed
_node(),
_distributorConfigHandler(),
diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
index e6af40a552d..ab962fc78b2 100644
--- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
@@ -6,6 +6,7 @@
#include <vespa/storage/common/i_storage_chain_builder.h>
#include <vespa/storage/config/config-stor-server.h>
#include <vespa/storage/storageserver/servicelayernode.h>
+#include <vespa/storageframework/defaultimplementation/clock/realclock.h>
#include <vespa/searchvisitor/searchvisitor.h>
#include <vespa/log/log.h>