GithubStar/workflow
1
0
Fork 0
mirror of https://github.com/sogou/workflow.git synced 2026-10-23 15:59:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #391 from holmes1412/master

Browse Source 
fix upstream rwlock bug
This commit is contained in:
xiehan
2021-05-27 20:28:34 +08:00
committed by GitHub
parent 11427756d2 5740f9de73
commit c646d0d85d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/UpstreamManager.cc
+3
View File
@@ -71,6 +71,7 @@ int UpstreamManager::upstream_create_consistent_hash(const std::string& name,
return 0;
}
delete policy;
return -1;
}
@@ -86,6 +87,7 @@ int UpstreamManager::upstream_create_weighted_random(const std::string& name,
return 0;
}
delete policy;
return -1;
}
@@ -104,6 +106,7 @@ int UpstreamManager::upstream_create_manual(const std::string& name,
return 0;
}
delete policy;
return -1;
}
src/nameservice/WFServiceGovernance.cc
+4 -4
View File
@@ -226,7 +226,7 @@ void WFServiceGovernance::success(RouteManager::RouteResult *result,
else
server = (EndpointAddress *)tracing->data;
pthread_rwlock_rdlock(&this->rwlock);
pthread_rwlock_wrlock(&this->rwlock);
this->recover_server_from_breaker(server);
pthread_rwlock_unlock(&this->rwlock);
@@ -246,7 +246,7 @@ void WFServiceGovernance::failed(RouteManager::RouteResult *result,
else
server = (EndpointAddress *)tracing->data;
pthread_rwlock_rdlock(&this->rwlock);
pthread_rwlock_wrlock(&this->rwlock);
size_t fail_count = ++server->fail_count;
if (fail_count == server->params->max_fails)
this->fuse_server_to_breaker(server);
@@ -428,7 +428,7 @@ int WFServiceGovernance::replace_server(const std::string& address,
void WFServiceGovernance::enable_server(const std::string& address)
{
pthread_rwlock_rdlock(&this->rwlock);
pthread_rwlock_wrlock(&this->rwlock);
const auto map_it = this->server_map.find(address);
if (map_it != this->server_map.cend())
{
@@ -440,7 +440,7 @@ void WFServiceGovernance::enable_server(const std::string& address)
void WFServiceGovernance::disable_server(const std::string& address)
{
pthread_rwlock_rdlock(&this->rwlock);
pthread_rwlock_wrlock(&this->rwlock);
const auto map_it = this->server_map.find(address);
if (map_it != this->server_map.cend())
{