diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-07-01 11:27:17 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-07-01 11:27:17 +0000 |
commit | 9d8138fd907efeeb7a98305cd5068e82c23e53db (patch) | |
tree | 9e254bd3d1b68d292c7700cfc0b4204dc027f855 /storage | |
parent | 99b4c31e2be70cdee15409149ce5dd931f785b57 (diff) |
Skip dispatching on reply in FileStorManager
Diffstat (limited to 'storage')
3 files changed, 6 insertions, 10 deletions
diff --git a/storage/src/vespa/storage/common/storagelinkqueued.h b/storage/src/vespa/storage/common/storagelinkqueued.h index 9fa0099f9a1..25b6c4fd1b6 100644 --- a/storage/src/vespa/storage/common/storagelinkqueued.h +++ b/storage/src/vespa/storage/common/storagelinkqueued.h @@ -128,8 +128,6 @@ private: }; framework::ComponentRegister& _compReg; - std::unique_ptr<framework::Thread> _replyThread; - std::unique_ptr<framework::Thread> _commandThread; ReplyDispatcher _replyDispatcher; CommandDispatcher _commandDispatcher; uint16_t _closeState; diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp index 021c94464df..a9a75ad4292 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp @@ -28,7 +28,7 @@ namespace storage { FileStorManager:: FileStorManager(const config::ConfigUri & configUri, const spi::PartitionStateList& partitions, spi::PersistenceProvider& provider, ServiceLayerComponentRegister& compReg) - : StorageLinkQueued("File store manager", compReg), + : StorageLink("File store manager"), framework::HtmlStatusReporter("filestorman", "File store manager"), _compReg(compReg), _component(compReg, "filestormanager"), @@ -251,7 +251,7 @@ FileStorManager::handlePersistenceMessage( const shared_ptr<api::StorageMessage> reply->setResult(errorCode); LOG(spam, "Received persistence message %s. Returning reply: %s", msg->getType().getName().c_str(), errorCode.toString().c_str()); - dispatchUp(reply); + sendUp(reply); } return true; } @@ -765,13 +765,13 @@ FileStorManager::sendReply(const std::shared_ptr<api::StorageReply>& reply) // Currently we need to dispatch due to replies sent by remapQueue // function in handlerimpl, as filestorthread keeps bucket db lock // while running this function - dispatchUp(reply); + sendUp(reply); } void FileStorManager::sendUp(const std::shared_ptr<api::StorageMessage>& msg) { - StorageLinkQueued::sendUp(msg); + StorageLink::sendUp(msg); } void FileStorManager::onClose() @@ -783,7 +783,6 @@ void FileStorManager::onClose() _filestorHandler->close(); LOG(debug, "Closed _filestorHandler."); _closed = true; - StorageLinkQueued::onClose(); LOG(debug, "Done closing"); } @@ -815,7 +814,6 @@ void FileStorManager::onFlush(bool downwards) "stopped: %s", result.c_str()); } - StorageLinkQueued::onFlush(downwards); LOG(debug, "Done Flushing"); } diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h index 452b83bb794..6bc20dde5d2 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h @@ -19,7 +19,7 @@ #include <vespa/storage/common/messagesender.h> #include <vespa/storage/common/servicelayercomponent.h> #include <vespa/storage/common/statusmessages.h> -#include <vespa/storage/common/storagelinkqueued.h> +#include <vespa/storage/common/storagelink.h> #include <vespa/config-stor-filestor.h> #include <vespa/storage/persistence/diskthread.h> @@ -42,7 +42,7 @@ class ReadBucketList; class BucketOwnershipNotifier; class AbortBucketOperationsCommand; -class FileStorManager : public StorageLinkQueued, +class FileStorManager : public StorageLink, public framework::HtmlStatusReporter, public StateListener, private config::IFetcherCallback<vespa::config::content::StorFilestorConfig>, |