mirror
/
etcd-cpp-apiv3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes the deadlock in keep alive (#191) 

Signed-off-by: Tao He <sighingnow@gmail.com>
This commit is contained in:
Tao He 2023-02-14 21:20:12 +08:00 committed by GitHub
parent 81d446e55c
commit 9b5c5bd3c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcd/v3/AsyncLeaseAction.hpp
View File

@ -62,7 +62,7 @@ namespace etcdv3
LeaseKeepAliveRequest req; LeaseKeepAliveRequest req;
bool isCancelled; bool isCancelled;
std::mutex protect_is_cancelled; std::recursive_mutex protect_is_cancelled;
friend class etcd::KeepAlive; friend class etcd::KeepAlive;
}; };

4
src/v3/AsyncLeaseAction.cpp
View File

@ -97,7 +97,7 @@ etcdv3::AsyncLeaseKeepAliveResponse etcdv3::AsyncLeaseKeepAliveAction::ParseResp
etcd::Response etcdv3::AsyncLeaseKeepAliveAction::Refresh() etcd::Response etcdv3::AsyncLeaseKeepAliveAction::Refresh()
{ {
std::lock_guard<std::mutex> scope_lock(this->protect_is_cancelled); std::lock_guard<std::recursive_mutex> scope_lock(this->protect_is_cancelled);
auto start_timepoint = std::chrono::high_resolution_clock::now(); auto start_timepoint = std::chrono::high_resolution_clock::now();
if (isCancelled) { if (isCancelled) {
@ -171,7 +171,7 @@ etcd::Response etcdv3::AsyncLeaseKeepAliveAction::Refresh()
void etcdv3::AsyncLeaseKeepAliveAction::CancelKeepAlive() void etcdv3::AsyncLeaseKeepAliveAction::CancelKeepAlive()
{ {
std::lock_guard<std::mutex> scope_lock(this->protect_is_cancelled); std::lock_guard<std::recursive_mutex> scope_lock(this->protect_is_cancelled);
if(isCancelled == false) if(isCancelled == false)
{ {
isCancelled = true; isCancelled = true;