From 55ce2bba1099df23fda959f88e049085eaf9c0dd Mon Sep 17 00:00:00 2001 From: Eric Liang Date: Thu, 16 Apr 2020 13:16:40 -0700 Subject: [PATCH] Record num plasma errs in map (#8034) --- src/ray/core_worker/core_worker.cc | 1 + .../store_provider/memory_store/memory_store.cc | 4 +++- .../store_provider/memory_store/memory_store.h | 1 + src/ray/protobuf/common.proto | 14 ++++++++------ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/ray/core_worker/core_worker.cc b/src/ray/core_worker/core_worker.cc index 9592732f5..1e6c3d486 100644 --- a/src/ray/core_worker/core_worker.cc +++ b/src/ray/core_worker/core_worker.cc @@ -1808,6 +1808,7 @@ void CoreWorker::HandleGetCoreWorkerStats(const rpc::GetCoreWorkerStatsRequest & (*stats->mutable_webui_display()) = webui_map; MemoryStoreStats memory_store_stats = memory_store_->GetMemoryStoreStatisticalData(); + stats->set_num_in_plasma(memory_store_stats.num_in_plasma); stats->set_num_local_objects(memory_store_stats.num_local_objects); stats->set_used_object_store_memory(memory_store_stats.used_object_store_memory); diff --git a/src/ray/core_worker/store_provider/memory_store/memory_store.cc b/src/ray/core_worker/store_provider/memory_store/memory_store.cc index 9260c9199..55cdcd075 100644 --- a/src/ray/core_worker/store_provider/memory_store/memory_store.cc +++ b/src/ray/core_worker/store_provider/memory_store/memory_store.cc @@ -455,7 +455,9 @@ MemoryStoreStats CoreWorkerMemoryStore::GetMemoryStoreStatisticalData() { absl::MutexLock lock(&mu_); MemoryStoreStats item; for (const auto &it : objects_) { - if (!it.second->IsInPlasmaError()) { + if (it.second->IsInPlasmaError()) { + item.num_in_plasma += 1; + } else { item.num_local_objects += 1; item.used_object_store_memory += it.second->GetSize(); } diff --git a/src/ray/core_worker/store_provider/memory_store/memory_store.h b/src/ray/core_worker/store_provider/memory_store/memory_store.h index c7b7b01c0..9e791803e 100644 --- a/src/ray/core_worker/store_provider/memory_store/memory_store.h +++ b/src/ray/core_worker/store_provider/memory_store/memory_store.h @@ -13,6 +13,7 @@ namespace ray { struct MemoryStoreStats { + int32_t num_in_plasma = 0; int32_t num_local_objects = 0; int64_t used_object_store_memory = 0; }; diff --git a/src/ray/protobuf/common.proto b/src/ray/protobuf/common.proto index 80eb6f111..02f907402 100644 --- a/src/ray/protobuf/common.proto +++ b/src/ray/protobuf/common.proto @@ -269,16 +269,18 @@ message CoreWorkerStats { map used_resources = 9; // A string displayed on Dashboard. map webui_display = 10; + // Number of objects that are IN_PLASMA_ERROR in the local memory store. + int32 num_in_plasma = 11; // Number of objects stored in local memory. - int32 num_local_objects = 11; + int32 num_local_objects = 12; // Used local object store memory. - int64 used_object_store_memory = 12; + int64 used_object_store_memory = 13; // Length of the task queue. - int32 task_queue_length = 13; + int32 task_queue_length = 14; // Number of executed tasks. - int32 num_executed_tasks = 14; + int32 num_executed_tasks = 15; // Actor constructor. - string actor_title = 15; + string actor_title = 16; // Local reference table. - repeated ObjectRefInfo object_refs = 16; + repeated ObjectRefInfo object_refs = 17; }