Skip to content

Use ts::bravo::shared_mutex for host status lock #13367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
masaori335 wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −14
Open

Use ts::bravo::shared_mutex for host status lock #13367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/proxy/HostStatus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "records/RecCore.h"
#include "tscore/Filenames.h"
#include "tscore/Layout.h"
#include "tscore/ink_rwlock.h"
#include "tsutil/Bravo.h"

#include <ctime>
#include <string>
Expand Down Expand Up @@ -252,5 +252,5 @@ struct HostStatus {
// next hop status, key is hostname or ip string, data is HostStatRec
std::unordered_map<std::string, HostStatRec *> hosts_statuses;

ink_rwlock host_status_rwlock;
ts::bravo::shared_mutex host_status_rwlock;
};
20 changes: 8 additions & 12 deletions src/proxy/HostStatus.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ HostStatRec::HostStatRec(std::string str)

HostStatus::HostStatus()
{
ink_rwlock_init(&host_status_rwlock);

// register JSON-RPC methods.
rpc::add_method_handler("admin_host_set_status", &server_set_status, &rpc::core_ats_rpc_service_provider_handle,
{{rpc::RESTRICTED_API}});
Expand All @@ -155,8 +153,6 @@ HostStatus::~HostStatus()
for (auto &&it : hosts_statuses) {
ats_free(it.second);
}
// release the read and writer locks.
ink_rwlock_destroy(&host_status_rwlock);
}

// loads host status persistent store file
Expand Down Expand Up @@ -188,16 +184,16 @@ HostStatus::loadRecord(std::string_view name, HostStatRec &h)
{
HostStatRec *host_stat = nullptr;
Dbg(dbg_ctl_host_statuses, "loading host status record for %.*s", int(name.size()), name.data());
ink_rwlock_wrlock(&host_status_rwlock);
{
std::scoped_lock lock(host_status_rwlock);

Comment thread
masaori335 marked this conversation as resolved.
auto it = hosts_statuses.find(std::string(name));
if (it == hosts_statuses.end()) {
host_stat = static_cast<HostStatRec *>(ats_malloc(sizeof(HostStatRec)));
*host_stat = h;
hosts_statuses.emplace(name, host_stat);
}
}
ink_rwlock_unlock(&host_status_rwlock);
}

void
Expand All @@ -208,8 +204,9 @@ HostStatus::setHostStatus(const std::string_view name, TSHostStatus status, cons
// update / insert status.
// using the hash table pointer to store the TSHostStatus value.
HostStatRec *host_stat = nullptr;
ink_rwlock_wrlock(&host_status_rwlock);
{
std::scoped_lock lock(host_status_rwlock);

Comment thread
masaori335 marked this conversation as resolved.
if (auto it = hosts_statuses.find(std::string(name)); it != hosts_statuses.end()) {
host_stat = it->second;
} else {
Expand Down Expand Up @@ -285,7 +282,6 @@ HostStatus::setHostStatus(const std::string_view name, TSHostStatus status, cons
Dbg(dbg_ctl_host_statuses, "reasons: %d, status: %s", host_stat->reasons, HostStatusNames[host_stat->status]);
}
}
ink_rwlock_unlock(&host_status_rwlock);

// log it.
if (status == TSHostStatus::TS_HOST_STATUS_DOWN) {
Expand All @@ -304,8 +300,9 @@ HostStatus::getAllHostStatuses(std::vector<HostStatuses> &hosts)
return;
}

ink_rwlock_rdlock(&host_status_rwlock);
{
ts::bravo::shared_lock<ts::bravo::shared_mutex> lock(host_status_rwlock);

for (std::pair<std::string, HostStatRec *> hsts : hosts_statuses) {
std::stringstream ss;
HostStatuses h;
Expand All @@ -315,7 +312,6 @@ HostStatus::getAllHostStatuses(std::vector<HostStatuses> &hosts)
hosts.push_back(h);
}
}
ink_rwlock_unlock(&host_status_rwlock);
}

// retrieve the named host status.
Expand All @@ -336,15 +332,15 @@ HostStatus::getHostStatus(const std::string_view name)
}

// the hash table value pointer has the TSHostStatus value.
ink_rwlock_rdlock(&host_status_rwlock);
{
ts::bravo::shared_lock<ts::bravo::shared_mutex> lock(host_status_rwlock);

auto it = hosts_statuses.find(std::string(name));
lookup = it != hosts_statuses.end();
if (lookup) {
Comment on lines +336 to 340

@masaori335 masaori335 Jul 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like pre-existing issue. I'll cover this in another PR to clarify scope of changes.

_status = it->second;
}
}
ink_rwlock_unlock(&host_status_rwlock);

// if the host was marked down and it's down_time has elapsed, mark it up.
if (lookup && _status->status == TSHostStatus::TS_HOST_STATUS_DOWN) {
Expand Down