Commit 56a4283b 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!662

Former-commit-id: 49c289905618bfd3303941cb4cddb16702bf308b
parents fd2fe676 02a76910

cpp/src/scheduler/ResourceMgr.cpp

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ void 
ResourceMgr::Clear() {

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

    disk_resources_.clear();

    cpu_resources_.clear();

    gpu_resources_.clear();

    resources_.clear();

}

cpp/unittest/db/utils.cpp

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ DBTest::TearDown() { 
    ms::scheduler::JobMgrInst::GetInstance()->Stop();

    ms::scheduler::SchedInst::GetInstance()->Stop();

    ms::scheduler::ResMgrInst::GetInstance()->Stop();

    ms::scheduler::ResMgrInst::GetInstance()->Clear();



    BaseTest::TearDown();