diff --git a/repair/repair.cc b/repair/repair.cc index 7301ba748f..b986f76f40 100644 --- a/repair/repair.cc +++ b/repair/repair.cc @@ -410,15 +410,15 @@ void repair_module::check_in_shutdown() { abort_source().check(); } -void repair_module::add_repair_info(int id, tasks::task_id uuid) { +void repair_module::add_shard_task_id(int id, tasks::task_id uuid) { _repairs.emplace(id, uuid); } -void repair_module::remove_repair_info(int id) { +void repair_module::remove_shard_task_id(int id) { _repairs.erase(id); } -tasks::task_manager::task_ptr repair_module::get_repair_info(int id) { +tasks::task_manager::task_ptr repair_module::get_shard_task_ptr(int id) { auto it = _repairs.find(id); if (it != _repairs.end()) { auto task_it = _tasks.find(it->second); @@ -1018,13 +1018,13 @@ future<> shard_repair_task_impl::run() { } auto& ri = _ri; - ri->rs.get_repair_module().add_repair_info(ri->id.id, _status.id); + ri->rs.get_repair_module().add_shard_task_id(ri->id.id, _status.id); return do_repair_ranges().then([ri] { ri->check_failed_ranges(); - ri->rs.get_repair_module().remove_repair_info(ri->id.id); + ri->rs.get_repair_module().remove_shard_task_id(ri->id.id); return make_ready_future<>(); }).handle_exception([this, ri] (std::exception_ptr eptr) { - ri->rs.get_repair_module().remove_repair_info(_status.sequence_number); + ri->rs.get_repair_module().remove_shard_task_id(_status.sequence_number); return make_exception_future<>(std::move(eptr)); }); } diff --git a/repair/repair_task.hh b/repair/repair_task.hh index a1eae26b34..44043c48bd 100644 --- a/repair/repair_task.hh +++ b/repair/repair_task.hh @@ -156,9 +156,9 @@ public: repair_status get(int id) const; void check_in_shutdown(); - void add_repair_info(int id, tasks::task_id ri); - void remove_repair_info(int id); - tasks::task_manager::task_ptr get_repair_info(int id); + void add_shard_task_id(int id, tasks::task_id ri); + void remove_shard_task_id(int id); + tasks::task_manager::task_ptr get_shard_task_ptr(int id); std::vector get_active() const; size_t nr_running_repair_jobs(); void abort_all_repairs();