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

Merge branch 'branch-0.4.0' into 'branch-0.4.0'

Browse Source 
MS-458 fix bug for keep building index for one file when no gpu resource

See merge request megasearch/milvus!480

Former-commit-id: 6454851f6ccedf216e827105a51306af5e430c3f
This commit is contained in:
peng.xu 2019-09-04 17:23:04 +08:00
commit 2bfec26ce0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpp/CHANGELOG.md
View File

@ -17,8 +17,9 @@ Please mark all change in change log and use the ticket from JIRA.
- MS-430 - Search no result if index created with FLAT
- MS-443 - Create index hang again
- MS-436 - Delete vectors failed if index created with index_type: IVF_FLAT/IVF_SQ8
- MS-450 - server hang after run stop_server.sh
- MS-449 - Add vectors twice success, once with ids, the other no ids
- MS-450 - server hang after run stop_server.sh
- MS-458 - Keep building index for one file when no gpu resource
- MS-461 - Mysql meta unittest failed
- MS-462 - Run milvus server twices, should display error
- MS-463 - Search timeout

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

@ -522,7 +522,6 @@ void DBImpl::BackgroundCompaction(std::set<std::string> table_ids) {
status = BackgroundMergeFiles(table_id);
if (!status.ok()) {
ENGINE_LOG_ERROR << "Merge files for table " << table_id << " failed: " << status.ToString();
continue;//let other table get chance to merge
}
if (shutting_down_.load(std::memory_order_acquire)){
@ -765,7 +764,6 @@ void DBImpl::BackgroundBuildIndex() {
status = BuildIndex(file);
if (!status.ok()) {
ENGINE_LOG_ERROR << "Building index for " << file.id_ << " failed: " << status.ToString();
return;
}
if (shutting_down_.load(std::memory_order_acquire)){