milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(db): cleanup pre db destruction 

Former-commit-id: 98270b53f6bafcde31d44039bb224d547ce71b07
pull/191/head
Xu Peng 2019-04-19 15:57:12 +08:00 committed by xj.lin
parent 2de4f04771
commit 8e1e03b2ba
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cpp/src/db/DBImpl.cpp
View File

@ -107,7 +107,9 @@ Status DBImpl::merge_files(const std::string& group_id, const meta::DateT& date,
group_file.group_id = group_id;
group_file.date = date;
Status status = _pMeta->add_group_file(group_file);
if (!status.ok()) {
std::cout << status.ToString() << std::endl;
return status;
}
@ -127,7 +129,6 @@ Status DBImpl::merge_files(const std::string& group_id, const meta::DateT& date,
auto index_size = group_file.dimension * index->ntotal;
faiss::write_index(index.get(), group_file.location.c_str());
std::cout << "Merged size=" << index_size << std::endl;
if (index_size >= _options.index_trigger_size) {
group_file.file_type = meta::GroupFileSchema::TO_INDEX;
} else {
@ -201,6 +202,7 @@ Status DBImpl::build_index(const meta::GroupFileSchema& file) {
}
void DBImpl::background_build_index() {
std::lock_guard<std::mutex> lock(build_index_mutex_);
assert(bg_build_index_started_);
meta::GroupFilesSchema to_index_files;
_pMeta->files_to_index(to_index_files);
@ -214,6 +216,7 @@ void DBImpl::background_build_index() {
}
bg_build_index_started_ = false;
bg_build_index_finish_signal_.notify_all();
}
Status DBImpl::try_build_index() {
@ -230,7 +233,6 @@ void DBImpl::background_compaction() {
Status status;
for (auto group_id : group_ids) {
/* std::cout << __func__ << " group_id=" << group_id << std::endl; */
status = background_merge_files(group_id);
if (!status.ok()) {
_bg_error = status;
@ -240,11 +242,21 @@ void DBImpl::background_compaction() {
}
DBImpl::~DBImpl() {
std::unique_lock<std::mutex> lock(_mutex);
_shutting_down.store(true, std::memory_order_release);
while (_bg_compaction_scheduled) {
_bg_work_finish_signal.wait(lock);
{
std::unique_lock<std::mutex> lock(_mutex);
_shutting_down.store(true, std::memory_order_release);
while (_bg_compaction_scheduled) {
_bg_work_finish_signal.wait(lock);
}
}
{
std::unique_lock<std::mutex> lock(build_index_mutex_);
while (bg_build_index_started_) {
bg_build_index_finish_signal_.wait(lock);
}
}
std::vector<std::string> ids;
_pMemMgr->serialize(ids);
}
/*

2
cpp/src/db/DBImpl.h
View File

@ -64,7 +64,9 @@ private:
Status _bg_error;
std::atomic<bool> _shutting_down;
std::mutex build_index_mutex_;
bool bg_build_index_started_;
std::condition_variable bg_build_index_finish_signal_;
std::shared_ptr<meta::Meta> _pMeta;
std::shared_ptr<MemManager> _pMemMgr;