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

#2692 Milvus hangs during multi-thread concurrent search (#2715)

* #2642 Create index failed caused by server crashed.
Signed-off-by: Nyhmo <yihua.mo@zilliz.com>

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

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

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

* #2692 Milvus hangs during multi-thread concurrent search
Signed-off-by: Nyhmo <yihua.mo@zilliz.com>
上级 90bd54d2
...@@ -14,6 +14,7 @@ Please mark all change in change log and use the issue from GitHub ...@@ -14,6 +14,7 @@ Please mark all change in change log and use the issue from GitHub
- \#2637 Suit the range of HNSW parameters - \#2637 Suit the range of HNSW parameters
- \#2642 Create index failed and server crashed - \#2642 Create index failed and server crashed
- \#2649 Search parameter of annoy has conflict with document - \#2649 Search parameter of annoy has conflict with document
- \#2692 Milvus hangs during multi-thread concurrent search
## Feature ## Feature
......
...@@ -127,6 +127,7 @@ BaseRequest::OnPostExecute() { ...@@ -127,6 +127,7 @@ BaseRequest::OnPostExecute() {
void void
BaseRequest::Done() { BaseRequest::Done() {
std::unique_lock<std::mutex> lock(finish_mtx_);
done_ = true; done_ = true;
finish_cond_.notify_all(); finish_cond_.notify_all();
} }
......
...@@ -211,15 +211,16 @@ class BaseRequest { ...@@ -211,15 +211,16 @@ class BaseRequest {
protected: protected:
const std::shared_ptr<milvus::server::Context> context_; const std::shared_ptr<milvus::server::Context> context_;
mutable std::mutex finish_mtx_;
std::condition_variable finish_cond_;
RequestType type_; RequestType type_;
std::string request_group_; std::string request_group_;
bool async_; bool async_;
bool done_;
Status status_; Status status_;
private:
mutable std::mutex finish_mtx_;
std::condition_variable finish_cond_;
bool done_;
public: public:
const std::shared_ptr<milvus::server::Context>& const std::shared_ptr<milvus::server::Context>&
Context() const { Context() const {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册