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

Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0

Browse Source 
Former-commit-id: 2e80e61b46c0f3b926eee5676ab38f77514a26f1
This commit is contained in:
quicksilver 2019-09-25 15:04:49 +08:00
commit 34a5e23f36
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cpp/unittest/server/rpc_test.cpp
View File

@ -50,19 +50,19 @@ class RpcHandlerTest : public testing::Test {
void void
SetUp() override { SetUp() override {
auto res_mgr = engine::ResMgrInst::GetInstance(); auto res_mgr = scheduler::ResMgrInst::GetInstance();
res_mgr->Clear(); res_mgr->Clear();
res_mgr->Add(engine::ResourceFactory::Create("disk", "DISK", 0, true, false)); res_mgr->Add(scheduler::ResourceFactory::Create("disk", "DISK", 0, true, false));
res_mgr->Add(engine::ResourceFactory::Create("cpu", "CPU", 0, true, true)); res_mgr->Add(scheduler::ResourceFactory::Create("cpu", "CPU", 0, true, true));
res_mgr->Add(engine::ResourceFactory::Create("gtx1660", "GPU", 0, true, true)); res_mgr->Add(scheduler::ResourceFactory::Create("gtx1660", "GPU", 0, true, true));
auto default_conn = engine::Connection("IO", 500.0); auto default_conn = scheduler::Connection("IO", 500.0);
auto PCIE = engine::Connection("IO", 11000.0); auto PCIE = scheduler::Connection("IO", 11000.0);
res_mgr->Connect("disk", "cpu", default_conn); res_mgr->Connect("disk", "cpu", default_conn);
res_mgr->Connect("cpu", "gtx1660", PCIE); res_mgr->Connect("cpu", "gtx1660", PCIE);
res_mgr->Start(); res_mgr->Start();
engine::SchedInst::GetInstance()->Start(); scheduler::SchedInst::GetInstance()->Start();
engine::JobMgrInst::GetInstance()->Start(); scheduler::JobMgrInst::GetInstance()->Start();
engine::DBOptions opt; engine::DBOptions opt;
@ -106,9 +106,9 @@ class RpcHandlerTest : public testing::Test {
void void
TearDown() override { TearDown() override {
server::DBWrapper::GetInstance().StopService(); server::DBWrapper::GetInstance().StopService();
engine::JobMgrInst::GetInstance()->Stop(); scheduler::JobMgrInst::GetInstance()->Stop();
engine::ResMgrInst::GetInstance()->Stop(); scheduler::ResMgrInst::GetInstance()->Stop();
engine::SchedInst::GetInstance()->Stop(); scheduler::SchedInst::GetInstance()->Stop();
boost::filesystem::remove_all("/tmp/milvus_test"); boost::filesystem::remove_all("/tmp/milvus_test");
} }
protected: protected: