From 0d1d783ad15a6a8cc9c0cd6c7ecdec78a605908a Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Thu, 31 Aug 2017 15:51:54 +0000 Subject: Update function name to reflect current semantics of fatal errors --- storage/src/vespa/storage/persistence/provider_error_wrapper.cpp | 4 ++-- storage/src/vespa/storage/persistence/provider_error_wrapper.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp b/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp index 07a983c23c0..80873829064 100644 --- a/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp +++ b/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp @@ -10,14 +10,14 @@ ResultType ProviderErrorWrapper::checkResult(ResultType&& result) const { if (result.getErrorCode() == spi::Result::FATAL_ERROR) { - trigger_shutdown_listeners_once(result.getErrorMessage()); + trigger_shutdown_listeners(result.getErrorMessage()); } else if (result.getErrorCode() == spi::Result::RESOURCE_EXHAUSTED) { trigger_resource_exhaustion_listeners(result.getErrorMessage()); } return std::forward(result); } -void ProviderErrorWrapper::trigger_shutdown_listeners_once(vespalib::stringref reason) const { +void ProviderErrorWrapper::trigger_shutdown_listeners(vespalib::stringref reason) const { std::lock_guard guard(_mutex); for (auto& listener : _listeners) { listener->on_fatal_error(reason); diff --git a/storage/src/vespa/storage/persistence/provider_error_wrapper.h b/storage/src/vespa/storage/persistence/provider_error_wrapper.h index 6965253a865..84adf37cbc3 100644 --- a/storage/src/vespa/storage/persistence/provider_error_wrapper.h +++ b/storage/src/vespa/storage/persistence/provider_error_wrapper.h @@ -78,7 +78,7 @@ private: template ResultType checkResult(ResultType&& result) const; - void trigger_shutdown_listeners_once(vespalib::stringref reason) const; + void trigger_shutdown_listeners(vespalib::stringref reason) const; void trigger_resource_exhaustion_listeners(vespalib::stringref reason) const; spi::PersistenceProvider& _impl; -- cgit v1.2.3