Skip to content

Commit 25ea331

Browse files
authored
[core] Move on HandleAddTaskEventData (#52904)
Signed-off-by: dayshah <[email protected]>
1 parent caf3680 commit 25ea331

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/ray/gcs/gcs_server/gcs_task_manager.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ namespace gcs {
3434

3535
GcsTaskManager::GcsTaskManager(instrumented_io_context &io_service)
3636
: io_service_(io_service),
37-
stats_counter_(),
3837
task_event_storage_(std::make_unique<GcsTaskManagerStorage>(
3938
RayConfig::instance().task_events_max_num_task_in_gcs(),
4039
stats_counter_,
@@ -381,6 +380,8 @@ void GcsTaskManager::GcsTaskManagerStorage::AddOrReplaceTaskEvent(
381380
}
382381
}
383382

383+
namespace {
384+
384385
template <typename T>
385386
bool apply_predicate(const T &lhs, rpc::FilterPredicate predicate, const T &rhs) {
386387
switch (predicate) {
@@ -412,6 +413,8 @@ bool apply_predicate_ignore_case(std::string_view lhs,
412413
}
413414
}
414415

416+
} // namespace
417+
415418
void GcsTaskManager::HandleGetTaskEvents(rpc::GetTaskEventsRequest request,
416419
rpc::GetTaskEventsReply *reply,
417420
rpc::SendReplyCallback send_reply_callback) {
@@ -607,7 +610,6 @@ void GcsTaskManager::HandleGetTaskEvents(rpc::GetTaskEventsRequest request,
607610
}
608611

609612
GCS_RPC_SEND_REPLY(send_reply_callback, reply, status);
610-
return;
611613
}
612614

613615
void GcsTaskManager::GcsTaskManagerStorage::RecordDataLossFromWorker(
@@ -639,7 +641,7 @@ void GcsTaskManager::GcsTaskManagerStorage::RecordDataLossFromWorker(
639641
void GcsTaskManager::HandleAddTaskEventData(rpc::AddTaskEventDataRequest request,
640642
rpc::AddTaskEventDataReply *reply,
641643
rpc::SendReplyCallback send_reply_callback) {
642-
auto data = std::move(request.data());
644+
auto data = std::move(*request.mutable_data());
643645
task_event_storage_->RecordDataLossFromWorker(data);
644646

645647
for (auto events_by_task : *data.mutable_events_by_task()) {
@@ -683,7 +685,7 @@ void GcsTaskManager::RecordMetrics() {
683685

684686
{
685687
absl::MutexLock lock(&mutex_);
686-
if (usage_stats_client_) {
688+
if (usage_stats_client_ != nullptr) {
687689
usage_stats_client_->RecordExtraUsageCounter(
688690
usage::TagKey::NUM_ACTOR_CREATION_TASKS, counters[kTotalNumActorCreationTask]);
689691
usage_stats_client_->RecordExtraUsageCounter(usage::TagKey::NUM_ACTOR_TASKS,

src/ray/gcs/gcs_server/gcs_task_manager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ class TaskEventsGcPolicyInterface {
6767

6868
class FinishedTaskActorTaskGcPolicy : public TaskEventsGcPolicyInterface {
6969
public:
70-
size_t MaxPriority() const { return 3; }
70+
size_t MaxPriority() const override { return 3; }
7171

72-
size_t GetTaskListPriority(const rpc::TaskEvents &task_events) const {
72+
size_t GetTaskListPriority(const rpc::TaskEvents &task_events) const override {
7373
if (IsTaskFinished(task_events)) {
7474
return 0;
7575
}

0 commit comments

Comments
 (0)