bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

node_ops: rename a method that get node ops entries

Browse Source
This commit is contained in:
Aleksandra Martyniuk
2024-12-20 12:25:48 +01:00
parent a7fc566c7e
commit ee4bd287fd
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/system_keyspace.cc
View File

@@ -3413,7 +3413,7 @@ future<system_keyspace::topology_requests_entry> system_keyspace::get_topology_r
co_return topology_request_row_to_entry(id, row);
}
future<system_keyspace::topology_requests_entries> system_keyspace::get_topology_request_entries(db_clock::time_point end_time_limit) {
future<system_keyspace::topology_requests_entries> system_keyspace::get_node_ops_request_entries(db_clock::time_point end_time_limit) {
// Running requests.
auto rs_running = co_await execute_cql(
format("SELECT * FROM system.{} WHERE done = false AND request_type IN ('{}', '{}', '{}', '{}', '{}') ALLOW FILTERING", TOPOLOGY_REQUESTS,

2
db/system_keyspace.hh
View File

@@ -643,7 +643,7 @@ public:
future<service::topology_request_state> get_topology_request_state(utils::UUID id, bool require_entry);
topology_requests_entry topology_request_row_to_entry(utils::UUID id, const cql3::untyped_result_set_row& row);
future<topology_requests_entry> get_topology_request_entry(utils::UUID id, bool require_entry);
future<topology_requests_entries> get_topology_request_entries(db_clock::time_point end_time_limit);
future<topology_requests_entries> get_node_ops_request_entries(db_clock::time_point end_time_limit);
public:
future<std::optional<int8_t>> get_service_levels_version();

2
node_ops/task_manager_module.cc
View File

@@ -56,7 +56,7 @@ static std::set<tasks::task_id> get_pending_ids(service::topology& topology) {
static future<db::system_keyspace::topology_requests_entries> get_entries(db::system_keyspace& sys_ks, service::topology& topology, std::chrono::seconds ttl) {
// Started requests.
auto entries = co_await sys_ks.get_topology_request_entries(db_clock::now() - ttl);
auto entries = co_await sys_ks.get_node_ops_request_entries(db_clock::now() - ttl);
// Pending requests.
for (auto& id : get_pending_ids(topology)) {