From 0d3da0b84124cd56aa1c6453a6e6756a8fa5d8a4 Mon Sep 17 00:00:00 2001 From: wxyu Date: Tue, 8 Oct 2019 15:03:16 +0800 Subject: [PATCH] MS-611 Add resources validity check in ResourceMgr Former-commit-id: 0957d8980a07a07434bc2bea3ecff686a56cb127 --- cpp/src/scheduler/ResourceMgr.cpp | 4 ++++ cpp/src/scheduler/task/SearchTask.cpp | 1 + 2 files changed, 5 insertions(+) diff --git a/cpp/src/scheduler/ResourceMgr.cpp b/cpp/src/scheduler/ResourceMgr.cpp index 3ea8a56e..d9da1f16 100644 --- a/cpp/src/scheduler/ResourceMgr.cpp +++ b/cpp/src/scheduler/ResourceMgr.cpp @@ -104,6 +104,10 @@ ResourceMgr::Connect(const std::string& name1, const std::string& name2, Connect void ResourceMgr::Clear() { std::lock_guard lck(resources_mutex_); + if (running_) { + ENGINE_LOG_ERROR << "ResourceMgr is running, cannot clear."; + return; + } disk_resources_.clear(); cpu_resources_.clear(); gpu_resources_.clear(); diff --git a/cpp/src/scheduler/task/SearchTask.cpp b/cpp/src/scheduler/task/SearchTask.cpp index 2beff8f4..41e65820 100644 --- a/cpp/src/scheduler/task/SearchTask.cpp +++ b/cpp/src/scheduler/task/SearchTask.cpp @@ -34,6 +34,7 @@ static constexpr size_t PARALLEL_REDUCE_BATCH = 1000; std::mutex XSearchTask::merge_mutex_; +// TODO(wxyu): remove unused code // bool // NeedParallelReduce(uint64_t nq, uint64_t topk) { // server::ServerConfig &config = server::ServerConfig::GetInstance(); -- GitLab