diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-08 15:56:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 15:56:31 +0100 |
| commit | 86ad7e732ffe81597ccb397cb4babb90fa8c1ceb (patch) | |
| tree | b264fb1bae094ad8018d528e3ac0c744eabb0610 /storageserver | |
| parent | b6a290f08603587e1325d92550714c82630506a2 (diff) | |
| parent | 6b3c9b6a7720b0ae4af9df7264aaf942121e2e56 (diff) | |
Merge pull request #25944 from vespa-engine/balder/final-consolidation-of-storage-framework-time-for-now
- Disconnect clock and MicroSecTime.
Diffstat (limited to 'storageserver')
| -rw-r--r-- | storageserver/src/vespa/storageserver/app/distributorprocess.cpp | 3 | ||||
| -rw-r--r-- | storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp | 1 |
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> |