Commit 9ddee796 authored by jinhai's avatar jinhai
Browse files

Merge branch 'branch-0.5.0' into 'branch-0.5.0' 

MS-611 Add resources validity check in ResourceMgr

See merge request megasearch/milvus!663

Former-commit-id: 55ff322f0e658f982747a2b7c4091999884e7618
parents 56a4283b 3fa68450

cpp/src/scheduler/JobMgr.cpp

+4 −6
Original line number Diff line number Diff line
@@ -66,16 +66,14 @@ JobMgr::worker_function() { 
        }



        auto tasks = build_task(job);

        auto disk_list = res_mgr_->GetDiskResources();

        if (!disk_list.empty()) {

            if (auto disk = disk_list[0].lock()) {

        // disk resources NEVER be empty.

        if (auto disk = res_mgr_->GetDiskResources()[0].lock()) {

            for (auto& task : tasks) {

                disk->task_table().Put(task);

            }

        }

    }

}

}



std::vector<TaskPtr>

JobMgr::build_task(const JobPtr& job) {

cpp/src/scheduler/ResourceMgr.cpp

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ ResourceMgr::Connect(const std::string& name1, const std::string& name2, Connect 
void

ResourceMgr::Clear() {

    std::lock_guard<std::mutex> lck(resources_mutex_);

    if (running_) {

        ENGINE_LOG_ERROR << "ResourceMgr is running, cannot clear.";

        return;

    }

    disk_resources_.clear();

    cpu_resources_.clear();

    gpu_resources_.clear();

cpp/src/scheduler/task/SearchTask.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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();