未验证 提交 b351c63c 编写于 作者: G groot 提交者: GitHub

fix #2264 (#2323)

* fix #2264
Signed-off-by: Nyhmo <yihua.mo@zilliz.com>

* typo
Signed-off-by: Nyhmo <yihua.mo@zilliz.com>

* fix ut
Signed-off-by: Nyhmo <yihua.mo@zilliz.com>

* typo
Signed-off-by: Nyhmo <yihua.mo@zilliz.com>
上级 23c05bb1
......@@ -27,7 +27,8 @@ Please mark all change in change log and use the issue from GitHub
- \#2228 Fix show partitions failed in http module
- \#2231 Use server_config to define hard-delete delay time for segment files
- \#2261 Re-define result returned by has_collection if collection in delete state
- \#2266 Server hang when using multi-clients to query different collections
- \#2264 Milvus opened too many files when the metric_config.enable_monitor=true
- \#2266 Server hangs when using multi-clients to query different collections
- \#2280 has_partition should return true for '_default'
## Feature
......
......@@ -2053,7 +2053,7 @@ DBImpl::BackgroundMerge(std::set<std::string> collection_ids) {
meta_ptr_->Archive();
{
uint64_t timeout = (options_.file_cleanup_timeout_ > 0) ? options_.file_cleanup_timeout_ : 10;
uint64_t timeout = (options_.file_cleanup_timeout_ >= 0) ? options_.file_cleanup_timeout_ : 10;
uint64_t ttl = timeout * meta::SECOND; // default: file will be hard-deleted few seconds after soft-deleted
meta_ptr_->CleanUpFilesWithTTL(ttl);
}
......
......@@ -321,6 +321,7 @@ SystemInfo::CPUTemperature() {
if (fscanf(file, "%f", &temp) != -1) {
result.push_back(temp / 1000);
}
fclose(file);
}
}
}
......
......@@ -195,8 +195,8 @@ DBTest::SetUp() {
#endif
res_mgr->Start();
milvus::scheduler::SchedInst::GetInstance()->Start();
milvus::scheduler::JobMgrInst::GetInstance()->Start();
milvus::scheduler::CPUBuilderInst::GetInstance()->Start();
auto options = GetOptions();
options.insert_cache_immediately_ = true;
......@@ -215,6 +215,7 @@ DBTest::TearDown() {
milvus::scheduler::JobMgrInst::GetInstance()->Stop();
milvus::scheduler::SchedInst::GetInstance()->Stop();
milvus::scheduler::CPUBuilderInst::GetInstance()->Stop();
milvus::scheduler::ResMgrInst::GetInstance()->Stop();
milvus::scheduler::ResMgrInst::GetInstance()->Clear();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册