From f1f931de705c0a26bd9a25336bb2e225fba0d1b2 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 14 Aug 2017 15:34:23 +0200 Subject: Remove some unused config parameters. --- .../storage/config/distributorconfiguration.cpp | 2 -- .../storage/config/distributorconfiguration.h | 8 +------- .../storage/config/stor-visitordispatcher.def | 24 ---------------------- .../distributor/externaloperationhandler.cpp | 19 +++++------------ .../operations/external/visitoroperation.h | 7 ++----- 5 files changed, 8 insertions(+), 52 deletions(-) (limited to 'storage') diff --git a/storage/src/vespa/storage/config/distributorconfiguration.cpp b/storage/src/vespa/storage/config/distributorconfiguration.cpp index c7461f17d5f..3007eff3d92 100644 --- a/storage/src/vespa/storage/config/distributorconfiguration.cpp +++ b/storage/src/vespa/storage/config/distributorconfiguration.cpp @@ -26,7 +26,6 @@ DistributorConfiguration::DistributorConfiguration(StorageComponent& component) _maxPendingMaintenanceOps(1000), _maxVisitorsPerNodePerClientVisitor(4), _minBucketsPerVisitor(5), - _minTimeLeftToResend(20), _maxClusterClockSkew(0), _doInlineSplit(true), _enableJoinForSiblingLessBuckets(false), @@ -172,7 +171,6 @@ DistributorConfiguration::configure(const vespa::config::content::core::StorDist void DistributorConfiguration::configure(const vespa::config::content::core::StorVisitordispatcherConfig& config) { - _minTimeLeftToResend = config.storagenetworklatency; _minBucketsPerVisitor = config.minbucketspervisitor; _maxVisitorsPerNodePerClientVisitor = config.maxvisitorspernodeperclientvisitor; } diff --git a/storage/src/vespa/storage/config/distributorconfiguration.h b/storage/src/vespa/storage/config/distributorconfiguration.h index 59336135cd3..d33f46befac 100644 --- a/storage/src/vespa/storage/config/distributorconfiguration.h +++ b/storage/src/vespa/storage/config/distributorconfiguration.h @@ -190,9 +190,6 @@ public: uint32_t getMinBucketsPerVisitor() const { return _minBucketsPerVisitor; } - int64_t getMinTimeLeftToResend() const { - return _minTimeLeftToResend; - } void setMaxVisitorsPerNodePerClientVisitor(uint32_t n) { _maxVisitorsPerNodePerClientVisitor = n; @@ -200,9 +197,7 @@ public: void setMinBucketsPerVisitor(uint32_t n) { _minBucketsPerVisitor = n; } - void setMinTimeLeftToResend(int64_t minTime) { - _minTimeLeftToResend = minTime; - } + uint32_t getMaxNodesPerMerge() const { return _maxNodesPerMerge; } @@ -265,7 +260,6 @@ private: uint32_t _maxVisitorsPerNodePerClientVisitor; uint32_t _minBucketsPerVisitor; - int64_t _minTimeLeftToResend; MaintenancePriorities _maintenancePriorities; std::chrono::seconds _maxClusterClockSkew; diff --git a/storage/src/vespa/storage/config/stor-visitordispatcher.def b/storage/src/vespa/storage/config/stor-visitordispatcher.def index 74495d0f6fd..2e418c97989 100644 --- a/storage/src/vespa/storage/config/stor-visitordispatcher.def +++ b/storage/src/vespa/storage/config/stor-visitordispatcher.def @@ -17,27 +17,3 @@ maxvisitorspernodeperclientvisitor int default=16 # node. If min buckets were 20, only 2 visitors of 20 buckets each would be # sent. minbucketspervisitor int default=1 - -# Deprecated - not in use -storagenetworklatency int default=2 - -# Deprecated - not in use -maxbucketspervisitor int default=100 - -# Deprecated - not in use -minpendingperstoragevisitor int default=2 - -# Deprecated - not in use -minsuperbucketsactive int default=50 - -# Deprecated - not in use -minsubbucketsactive int default=10000 - -# Deprecated - not in use -progresstimeout int default=180000 - -# Deprecated - not in use -highprioritylimit int default=600000 - -# Deprecated - not in use -veryhighprioritylimit int default=60000 diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp index 87f93eacf39..e67e889ff7e 100644 --- a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp +++ b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp @@ -23,8 +23,7 @@ #include LOG_SETUP(".distributor.manager"); -namespace storage { -namespace distributor { +namespace storage::distributor { ExternalOperationHandler::ExternalOperationHandler( Distributor& owner, @@ -276,18 +275,10 @@ IMPL_MSG_COMMAND_H(ExternalOperationHandler, GetBucketList) IMPL_MSG_COMMAND_H(ExternalOperationHandler, CreateVisitor) { const DistributorConfiguration& config(getDistributor().getConfig()); - VisitorOperation::Config visitorConfig( - framework::MilliSecTime(config.getMinTimeLeftToResend()), - config.getMinBucketsPerVisitor(), - config.getMaxVisitorsPerNodePerClientVisitor()); - _op = Operation::SP(new VisitorOperation( - *this, - cmd, - visitorConfig, - getMetrics().visits[cmd->getLoadType()])); + VisitorOperation::Config visitorConfig(config.getMinBucketsPerVisitor(), + config.getMaxVisitorsPerNodePerClientVisitor()); + _op = Operation::SP(new VisitorOperation(*this, cmd, visitorConfig, getMetrics().visits[cmd->getLoadType()])); return true; } -} // distributor -} // storage - +} diff --git a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h index 10b2b5757ab..006e2916335 100644 --- a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h @@ -23,14 +23,11 @@ class VisitorOperation : public Operation { public: struct Config { - Config(const framework::MilliSecTime& storageNetworkLatency_, - uint32_t minBucketsPerVisitor_, + Config(uint32_t minBucketsPerVisitor_, uint32_t maxVisitorsPerNodePerVisitor_) - : storageNetworkLatency(storageNetworkLatency_), - minBucketsPerVisitor(minBucketsPerVisitor_), + : minBucketsPerVisitor(minBucketsPerVisitor_), maxVisitorsPerNodePerVisitor(maxVisitorsPerNodePerVisitor_) {} - framework::MilliSecTime storageNetworkLatency; uint32_t minBucketsPerVisitor; uint32_t maxVisitorsPerNodePerVisitor; }; -- cgit v1.2.3