diff options
| author | Geir Storli <geirst@oath.com> | 2018-09-25 13:30:37 +0000 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:22 +0100 |
| commit | e6899fbbefb64f3ab0a57e8502af3287e4d92f17 (patch) | |
| tree | fbde37456c79524cf301236612c3a623247c26d5 /storage | |
| parent | 2a98f5c8cd0ae8114064f5e6c5ae1631d780daae (diff) | |
Remove metrics for persistence provider that were deprecated and broken (not thread safe) on Vespa 6.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp | 4 | ||||
| -rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/filestormanager.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp index e7323d07480..76e04852178 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp @@ -34,8 +34,7 @@ FileStorManager(const config::ConfigUri & configUri, const spi::PartitionStateLi _partitions(partitions), _providerCore(provider), _providerErrorWrapper(_providerCore), - _providerMetric(new spi::MetricPersistenceProvider(_providerErrorWrapper)), - _provider(_providerMetric.get()), + _provider(&_providerErrorWrapper), _bucketIdFactory(_component.getBucketIdFactory()), _configUri(configUri), _disks(), @@ -47,7 +46,6 @@ FileStorManager(const config::ConfigUri & configUri, const spi::PartitionStateLi _threadMonitor(), _closed(false) { - _metrics->registerMetric(*_providerMetric), _configFetcher.subscribe(_configUri.getConfigId(), this); _configFetcher.start(); _component.registerMetric(*_metrics); diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h index 5c52e6c6a23..8c7e206237b 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h @@ -14,7 +14,6 @@ #include <vespa/vespalib/util/sync.h> #include <vespa/document/bucket/bucketid.h> #include <vespa/persistence/spi/persistenceprovider.h> -#include <vespa/persistence/spi/metricpersistenceprovider.h> #include <vespa/storage/bucketdb/storbucketdb.h> #include <vespa/storage/common/messagesender.h> #include <vespa/storage/common/servicelayercomponent.h> @@ -56,7 +55,6 @@ class FileStorManager : public StorageLinkQueued, const spi::PartitionStateList& _partitions; spi::PersistenceProvider& _providerCore; ProviderErrorWrapper _providerErrorWrapper; - spi::MetricPersistenceProvider::UP _providerMetric; spi::PersistenceProvider* _provider; const document::BucketIdFactory& _bucketIdFactory; |