diff options
7 files changed, 9 insertions, 13 deletions
diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index d123a5711ac..eb4f1f6dc89 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -397,8 +397,8 @@ writefilter.memorylimit double default = 0.8 ## put and update portion of feed is blocked. writefilter.disklimit double default = 0.8 -## Interval between sampling of disk and memory usage. Default is 60 seconds. -writefilter.sampleinterval double default = 60.0 +## Interval between sampling of disk and memory usage. Default is 20 seconds. +writefilter.sampleinterval double default = 20.0 ## The size of the disk partition (in bytes) on which proton basedir is located. ## If set to 0, the disk size is sampled by looking at the filesystem space info. diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.cpp index 9445a0a5206..1a6fc6cdbfd 100644 --- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.cpp @@ -163,7 +163,7 @@ DiskMemUsageFilter::DiskMemUsageFilter(const HwInfo &hwInfo) _listeners() { } -DiskMemUsageFilter::~DiskMemUsageFilter() { } +DiskMemUsageFilter::~DiskMemUsageFilter() = default; void DiskMemUsageFilter::setMemoryStats(vespalib::ProcessMemoryStats memoryStats_in) diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_state.h b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_state.h index 40c74808e72..b05cc261728 100644 --- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_state.h +++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_state.h @@ -15,11 +15,7 @@ class DiskMemUsageState ResourceUsageState _memoryState; public: - DiskMemUsageState() - : _diskState(), - _memoryState() - { - } + DiskMemUsageState() = default; DiskMemUsageState(const ResourceUsageState &diskState_, const ResourceUsageState &memoryState_) : _diskState(diskState_), diff --git a/searchcore/src/vespa/searchcore/proton/server/i_blockable_maintenance_job.h b/searchcore/src/vespa/searchcore/proton/server/i_blockable_maintenance_job.h index c70a6c502f1..63ff269580e 100644 --- a/searchcore/src/vespa/searchcore/proton/server/i_blockable_maintenance_job.h +++ b/searchcore/src/vespa/searchcore/proton/server/i_blockable_maintenance_job.h @@ -36,7 +36,7 @@ public: */ virtual void unBlock(BlockedReason reason) = 0; - virtual IBlockableMaintenanceJob *asBlockable() override { return this; } + IBlockableMaintenanceJob *asBlockable() override { return this; } }; } diff --git a/searchcore/src/vespa/searchcore/proton/server/i_maintenance_job.h b/searchcore/src/vespa/searchcore/proton/server/i_maintenance_job.h index 6d0739e1aed..df6889ecf04 100644 --- a/searchcore/src/vespa/searchcore/proton/server/i_maintenance_job.h +++ b/searchcore/src/vespa/searchcore/proton/server/i_maintenance_job.h @@ -31,7 +31,7 @@ public: _interval(interval) {} - virtual ~IMaintenanceJob() {} + virtual ~IMaintenanceJob() = default; virtual const vespalib::string &getName() const { return _name; } virtual vespalib::duration getDelay() const { return _delay; } diff --git a/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp b/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp index 6c0c0863fe1..e535b05393c 100644 --- a/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp @@ -41,9 +41,7 @@ MoveOperationLimiter::MoveOperationLimiter(IBlockableMaintenanceJob *job, { } -MoveOperationLimiter::~MoveOperationLimiter() -{ -} +MoveOperationLimiter::~MoveOperationLimiter() = default; void MoveOperationLimiter::clearJob() diff --git a/staging_vespalib/src/vespa/vespalib/util/process_memory_stats.cpp b/staging_vespalib/src/vespa/vespalib/util/process_memory_stats.cpp index ff1d7e1d6ec..e2e8e49419f 100644 --- a/staging_vespalib/src/vespa/vespalib/util/process_memory_stats.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/process_memory_stats.cpp @@ -196,6 +196,8 @@ ProcessMemoryStats::create(uint64_t sizeEpsilon) i, (samples.rbegin()+1)->toString().c_str(), samples.back().toString().c_str()); } std::sort(samples.begin(), samples.end()); + LOG(warning, "We failed to find 2 consecutive samples that where similar with epsilon of %lu.\nSmallest is '%s',\n median is '%s',\n largest is '%s'", + sizeEpsilon, samples.front().toString().c_str(), samples[samples.size()/2].toString().c_str(), samples.back().toString().c_str()); return samples[samples.size()/2]; } |