From 6d0a2489c0dc7705a18ee60b6024e5b709b84af7 Mon Sep 17 00:00:00 2001
From: wxyu <xy.wang@zilliz.com>
Date: Tue, 8 Oct 2019 14:48:11 +0800
Subject: [PATCH] MS-611 Add resources validity check in ResourceMgr

Former-commit-id: 8732bacae82613066c415d4e22db256f9b8056d2
---
 cpp/src/scheduler/ResourceMgr.cpp | 2 ++
 cpp/unittest/db/utils.cpp         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/cpp/src/scheduler/ResourceMgr.cpp b/cpp/src/scheduler/ResourceMgr.cpp
index 41c4ddbc5e..3ea8a56ef8 100644
--- a/cpp/src/scheduler/ResourceMgr.cpp
+++ b/cpp/src/scheduler/ResourceMgr.cpp
@@ -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();
 }
 
diff --git a/cpp/unittest/db/utils.cpp b/cpp/unittest/db/utils.cpp
index 61c75a0933..c5874be694 100644
--- a/cpp/unittest/db/utils.cpp
+++ b/cpp/unittest/db/utils.cpp
@@ -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();