diff options
author | Tor Egge <Tor.Egge@oath.com> | 2017-10-03 11:37:51 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2017-10-03 11:40:31 +0000 |
commit | 32f8d5bb20479e0895f97cebe9f575d7b09de8c5 (patch) | |
tree | 9d4d7808a5da6315df2088c03f419d7ece0c250f /storageserver | |
parent | 6e134d121f14dd940f84b25b5bc27ad22d80af2f (diff) |
Remove unused support for SPI over RPC.
Diffstat (limited to 'storageserver')
4 files changed, 0 insertions, 76 deletions
diff --git a/storageserver/src/apps/storaged/storage.cpp b/storageserver/src/apps/storaged/storage.cpp index 1f3109381fd..9e98f599bc5 100644 --- a/storageserver/src/apps/storaged/storage.cpp +++ b/storageserver/src/apps/storaged/storage.cpp @@ -18,7 +18,6 @@ #include "forcelink.h" #include <vespa/storageserver/app/memfileservicelayerprocess.h> #include <vespa/storageserver/app/dummyservicelayerprocess.h> -#include <vespa/storageserver/app/rpcservicelayerprocess.h> #include <vespa/vespalib/util/programoptions.h> #include <vespa/vespalib/util/shutdownguard.h> #include <iostream> @@ -43,8 +42,6 @@ Process::UP createProcess(vespalib::stringref configId) { return Process::UP(new MemFileServiceLayerProcess(configId)); case vespa::config::content::core::StorServerConfig::PersistenceProvider::DUMMY: return Process::UP(new DummyServiceLayerProcess(configId)); - case vespa::config::content::core::StorServerConfig::PersistenceProvider::RPC: - return Process::UP(new RpcServiceLayerProcess(configId)); default: throw vespalib::IllegalStateException( "Unknown persistence provider.", VESPA_STRLOC); diff --git a/storageserver/src/vespa/storageserver/app/CMakeLists.txt b/storageserver/src/vespa/storageserver/app/CMakeLists.txt index 25bd4686c36..2311c636228 100644 --- a/storageserver/src/vespa/storageserver/app/CMakeLists.txt +++ b/storageserver/src/vespa/storageserver/app/CMakeLists.txt @@ -5,7 +5,6 @@ vespa_add_library(storageserver_storageapp STATIC distributorprocess.cpp servicelayerprocess.cpp dummyservicelayerprocess.cpp - rpcservicelayerprocess.cpp memfileservicelayerprocess.cpp DEPENDS storage_storageserver diff --git a/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp deleted file mode 100644 index ab0cd1f6089..00000000000 --- a/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include "rpcservicelayerprocess.h" -#include <vespa/storage/config/config-stor-server.h> -#include <vespa/config/helper/configgetter.hpp> - -#include <vespa/log/log.h> -LOG_SETUP(".process.servicelayer"); - -namespace storage { - -// RpcServiceLayerProcess implementation - -RpcServiceLayerProcess::RpcServiceLayerProcess(const config::ConfigUri & configUri) - : ServiceLayerProcess(configUri) -{ -} - -void -RpcServiceLayerProcess::shutdown() -{ - ServiceLayerProcess::shutdown(); - _provider.reset(0); -} - -void -RpcServiceLayerProcess::setupProvider() -{ - std::unique_ptr<vespa::config::content::core::StorServerConfig> serverConfig = - config::ConfigGetter<vespa::config::content::core::StorServerConfig>::getConfig(_configUri.getConfigId(), _configUri.getContext()); - - _provider.reset(new spi::ProviderProxy( - serverConfig->persistenceProvider.rpc.connectspec, *getTypeRepo())); -} - -void -RpcServiceLayerProcess::updateConfig() -{ - ServiceLayerProcess::updateConfig(); - LOG(info, "Config updated. Sending new config to RPC proxy provider"); - _provider->setRepo(*getTypeRepo()); -} - -} // storage diff --git a/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.h b/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.h deleted file mode 100644 index cd104795c76..00000000000 --- a/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * \class storage::RpcServiceLayerProcess - * - * \brief A process running a service layer with RPC persistence provider. - */ -#pragma once - -#include <vespa/persistence/proxy/providerproxy.h> -#include <vespa/storageserver/app/servicelayerprocess.h> - -namespace storage { - -class RpcServiceLayerProcess : public ServiceLayerProcess { - spi::ProviderProxy::UP _provider; - -public: - RpcServiceLayerProcess(const config::ConfigUri & configUri); - ~RpcServiceLayerProcess() { shutdown(); } - - virtual void shutdown() override; - virtual void setupProvider() override; - virtual void updateConfig() override; - virtual spi::PersistenceProvider& getProvider() override { return *_provider; } -}; - -} // storage - |