summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-12-13 07:02:17 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2022-12-13 07:02:17 +0000
commitf31f6728a2b489ccdb4cd29a5115a05898463042 (patch)
treeb42f7d7a177d58d94702b5b815117f3946ed81e8 /searchcore
parente7c958c4abd98a8ef43ab191d9457c089a00031f (diff)
Remove includes not needed.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp5
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h2
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h24
3 files changed, 14 insertions, 17 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
index 9b6ec85ce9b..70718b54e50 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
@@ -1,7 +1,7 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include "disk_mem_usage_sampler.h"
-#include <vespa/searchcore/proton/common/scheduledexecutor.h>
+#include <vespa/searchcore/proton/common/i_scheduled_executor.h>
#include <vespa/vespalib/util/lambdatask.h>
#include <vespa/searchcore/proton/common/i_transient_resource_usage_provider.h>
#include <filesystem>
@@ -76,8 +76,7 @@ uint64_t
attemptSampleDirectoryDiskUsageOnce(const fs::path &path)
{
uint64_t result = 0;
- for (const auto &elem : fs::recursive_directory_iterator(path,
- fs::directory_options::skip_permission_denied)) {
+ for (const auto &elem : fs::recursive_directory_iterator(path, fs::directory_options::skip_permission_denied)) {
if (fs::is_regular_file(elem.path()) && !fs::is_symlink(elem.path())) {
std::error_code fsize_err;
const auto size = fs::file_size(elem.path(), fsize_err);
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
index 7b1ba40e30c..c2e8f055d09 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
@@ -5,8 +5,6 @@
#include "disk_mem_usage_filter.h"
#include <vespa/searchcore/proton/common/i_scheduled_executor.h>
-class FNET_Transport;
-
namespace vespalib { class IDestructorCallback; }
namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h
index 0717a4ddc87..af2f7e8a0fc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h
@@ -25,7 +25,7 @@ namespace searchcorespi::index {
namespace proton {
class MaintenanceJobRunner;
-class ScheduledExecutor;
+class IScheduledExecutor;
/**
* Class that controls the bucket moving between ready and notready sub databases
@@ -81,17 +81,17 @@ private:
using Guard = std::lock_guard<Mutex>;
using TaskHandle = std::unique_ptr<vespalib::IDestructorCallback>;
- ISyncableThreadService &_masterThread;
- vespalib::MonitoredRefCount &_refCount;
- MaintenanceDocumentSubDB _readySubDB;
- MaintenanceDocumentSubDB _remSubDB;
- MaintenanceDocumentSubDB _notReadySubDB;
- std::unique_ptr<ScheduledExecutor> _periodicTimer;
- std::vector<TaskHandle> _periodicTaskHandles;
- State _state;
- const DocTypeName &_docTypeName;
- JobList _jobs;
- mutable Mutex _jobsLock;
+ ISyncableThreadService &_masterThread;
+ vespalib::MonitoredRefCount &_refCount;
+ MaintenanceDocumentSubDB _readySubDB;
+ MaintenanceDocumentSubDB _remSubDB;
+ MaintenanceDocumentSubDB _notReadySubDB;
+ std::unique_ptr<IScheduledExecutor> _periodicTimer;
+ std::vector<TaskHandle> _periodicTaskHandles;
+ State _state;
+ const DocTypeName &_docTypeName;
+ JobList _jobs;
+ mutable Mutex _jobsLock;
void addJobsToPeriodicTimer();
void restart();