admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-29 23:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
MS-611 Add resources validity check in ResourceMgr

See merge request megasearch/milvus!662

Former-commit-id: bd4b9327b9fbd101e6811f6002f4dae4ff105f05
This commit is contained in:
jinhai 2019-10-08 14:49:04 +08:00
commit e62a7b3626
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/src/scheduler/ResourceMgr.cpp
View File

@ -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();
}

1
cpp/unittest/db/utils.cpp
View File

@ -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();