Skip to content

Commit 70d8f8e

Browse files
committed
[fix](warmup) recycle_cache should also recycle index files (apache#4104)
1 parent 415fb30 commit 70d8f8e

5 files changed

Lines changed: 40 additions & 13 deletions

File tree

‎be/src/cloud/cloud_internal_service.cpp‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,8 @@ void CloudInternalServiceImpl::warm_up_rowset(google::protobuf::RpcController* c
269269

270270
bvar::Adder<uint64_t> g_file_cache_recycle_cache_finished_segment_num(
271271
"file_cache_recycle_cache_finished_segment_num");
272+
bvar::Adder<uint64_t> g_file_cache_recycle_cache_finished_index_num(
273+
"file_cache_recycle_cache_finished_index_num");
272274

273275
void CloudInternalServiceImpl::recycle_cache(google::protobuf::RpcController* controller
274276
[[maybe_unused]],
@@ -277,14 +279,23 @@ void CloudInternalServiceImpl::recycle_cache(google::protobuf::RpcController* co
277279
google::protobuf::Closure* done) {
278280
brpc::ClosureGuard closure_guard(done);
279281

280-
if (config::enable_file_cache) {
281-
for (const auto& meta : request->cache_metas()) {
282-
for (int64_t segment_id = 0; segment_id < meta.num_segments(); segment_id++) {
283-
auto file_key = Segment::file_cache_key(meta.rowset_id(), segment_id);
284-
auto* file_cache = io::FileCacheFactory::instance()->get_by_path(file_key);
285-
file_cache->remove_if_cached_async(file_key);
286-
g_file_cache_recycle_cache_finished_segment_num << 1;
287-
}
282+
if (!config::enable_file_cache) {
283+
return;
284+
}
285+
for (const auto& meta : request->cache_metas()) {
286+
for (int64_t segment_id = 0; segment_id < meta.num_segments(); segment_id++) {
287+
auto file_key = Segment::file_cache_key(meta.rowset_id(), segment_id);
288+
auto* file_cache = io::FileCacheFactory::instance()->get_by_path(file_key);
289+
file_cache->remove_if_cached_async(file_key);
290+
g_file_cache_recycle_cache_finished_segment_num << 1;
291+
}
292+
293+
// inverted index
294+
for (const auto& file_name : meta.index_file_names()) {
295+
auto file_key = io::BlockFileCache::hash(file_name);
296+
auto* file_cache = io::FileCacheFactory::instance()->get_by_path(file_key);
297+
file_cache->remove_if_cached_async(file_key);
298+
g_file_cache_recycle_cache_finished_index_num << 1;
288299
}
289300
}
290301
}

‎be/src/cloud/cloud_tablet.cpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ bvar::Adder<uint64_t> g_file_cache_recycle_cached_data_segment_num(
8484
"file_cache_recycle_cached_data_segment_num");
8585
bvar::Adder<uint64_t> g_file_cache_recycle_cached_data_segment_size(
8686
"file_cache_recycle_cached_data_segment_size");
87+
bvar::Adder<uint64_t> g_file_cache_recycle_cached_data_index_num(
88+
"file_cache_recycle_cached_data_index_num");
8789

8890
CloudTablet::CloudTablet(CloudStorageEngine& engine, TabletMetaSharedPtr tablet_meta)
8991
: BaseTablet(std::move(tablet_meta)), _engine(engine) {}
@@ -629,6 +631,7 @@ void CloudTablet::clear_cache() {
629631
void CloudTablet::recycle_cached_data(const std::vector<RowsetSharedPtr>& rowsets) {
630632
std::vector<RowsetId> rowset_ids;
631633
std::vector<int64_t> num_segments;
634+
std::vector<std::vector<std::string>> index_file_names;
632635
for (const auto& rs : rowsets) {
633636
// rowsets and tablet._rs_version_map each hold a rowset shared_ptr, so at this point, the reference count of the shared_ptr is at least 2.
634637
if (rs.use_count() > 2) {
@@ -639,17 +642,20 @@ void CloudTablet::recycle_cached_data(const std::vector<RowsetSharedPtr>& rowset
639642
rs->clear_cache();
640643
rowset_ids.push_back(rs->rowset_id());
641644
num_segments.push_back(rs->num_segments());
645+
auto index_names = rs->get_index_file_names();
646+
index_file_names.push_back(index_names);
642647
int64_t segment_size_sum = 0;
643648
for (int32_t i = 0; i < rs->num_segments(); i++) {
644649
segment_size_sum += rs->rowset_meta()->segment_file_size(i);
645650
}
646651
g_file_cache_recycle_cached_data_segment_num << rs->num_segments();
647652
g_file_cache_recycle_cached_data_segment_size << segment_size_sum;
653+
g_file_cache_recycle_cached_data_index_num << index_names.size();
648654
}
649655
if (!rowsets.empty()) {
650656
auto& manager = ExecEnv::GetInstance()->storage_engine().to_cloud().cloud_warm_up_manager();
651-
manager.recycle_cache(rowsets.front()->rowset_meta()->tablet_id(), rowset_ids,
652-
num_segments);
657+
manager.recycle_cache(rowsets.front()->rowset_meta()->tablet_id(), rowset_ids, num_segments,
658+
index_file_names);
653659
}
654660
}
655661

‎be/src/cloud/cloud_warm_up_manager.cpp‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ bvar::Adder<uint64_t> g_file_cache_once_or_periodic_warm_up_finished_index_num(
6464
"file_cache_once_or_periodic_warm_up_finished_index_num");
6565
bvar::Adder<uint64_t> g_file_cache_recycle_cache_requested_segment_num(
6666
"file_cache_recycle_cache_requested_segment_num");
67+
bvar::Adder<uint64_t> g_file_cache_recycle_cache_requested_index_num(
68+
"file_cache_recycle_cache_requested_index_num");
6769

6870
CloudWarmUpManager::CloudWarmUpManager(CloudStorageEngine& engine) : _engine(engine) {
6971
_download_thread = std::thread(&CloudWarmUpManager::handle_jobs, this);
@@ -524,8 +526,10 @@ void CloudWarmUpManager::warm_up_rowset(RowsetMeta& rs_meta) {
524526
}
525527
}
526528

527-
void CloudWarmUpManager::recycle_cache(int64_t tablet_id, const std::vector<RowsetId>& rowset_ids,
528-
const std::vector<int64_t>& num_segments) {
529+
void CloudWarmUpManager::recycle_cache(
530+
int64_t tablet_id, const std::vector<RowsetId>& rowset_ids,
531+
const std::vector<int64_t>& num_segments,
532+
const std::vector<std::vector<std::string>>& index_file_names) {
529533
LOG(INFO) << "recycle_cache: tablet_id=" << tablet_id << ", num_rowsets=" << rowset_ids.size();
530534
auto replicas = get_replica_info(tablet_id);
531535
if (replicas.empty()) {
@@ -542,7 +546,11 @@ void CloudWarmUpManager::recycle_cache(int64_t tablet_id, const std::vector<Rows
542546
meta->set_tablet_id(tablet_id);
543547
meta->set_rowset_id(rowset_ids[i].to_string());
544548
meta->set_num_segments(num_segments[i]);
549+
for (const auto& name : index_file_names[i]) {
550+
meta->add_index_file_names(name);
551+
}
545552
g_file_cache_recycle_cache_requested_segment_num << num_segments[i];
553+
g_file_cache_recycle_cache_requested_index_num << index_file_names[i].size();
546554
}
547555
for (auto& replica : replicas) {
548556
// send sync request

‎be/src/cloud/cloud_warm_up_manager.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ class CloudWarmUpManager {
7272
void warm_up_rowset(RowsetMeta& rs_meta);
7373

7474
void recycle_cache(int64_t tablet_id, const std::vector<RowsetId>& rowset_ids,
75-
const std::vector<int64_t>& num_segments);
75+
const std::vector<int64_t>& num_segments,
76+
const std::vector<std::vector<std::string>>& index_file_names);
7677

7778
private:
7879
void handle_jobs();

‎gensrc/proto/internal_service.proto‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,7 @@ message RecycleCacheMeta {
848848
optional int64 tablet_id = 1;
849849
optional string rowset_id = 2;
850850
optional int64 num_segments = 3;
851+
repeated string index_file_names = 4;
851852
}
852853

853854
message PRecycleCacheRequest {

0 commit comments

Comments
 (0)