Skip to content

Commit 2cbc3f1

Browse files
committed
[fix](warmup) recycle_cache should also recycle index files (apache#4104)
1 parent c9e1755 commit 2cbc3f1

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
@@ -91,6 +91,8 @@ bvar::Adder<uint64_t> g_file_cache_recycle_cached_data_segment_num(
9191
"file_cache_recycle_cached_data_segment_num");
9292
bvar::Adder<uint64_t> g_file_cache_recycle_cached_data_segment_size(
9393
"file_cache_recycle_cached_data_segment_size");
94+
bvar::Adder<uint64_t> g_file_cache_recycle_cached_data_index_num(
95+
"file_cache_recycle_cached_data_index_num");
9496

9597
CloudTablet::CloudTablet(CloudStorageEngine& engine, TabletMetaSharedPtr tablet_meta)
9698
: BaseTablet(std::move(tablet_meta)), _engine(engine) {}
@@ -646,6 +648,7 @@ void CloudTablet::clear_cache() {
646648
void CloudTablet::recycle_cached_data(const std::vector<RowsetSharedPtr>& rowsets) {
647649
std::vector<RowsetId> rowset_ids;
648650
std::vector<int64_t> num_segments;
651+
std::vector<std::vector<std::string>> index_file_names;
649652
for (const auto& rs : rowsets) {
650653
// 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.
651654
if (rs.use_count() > 2) {
@@ -656,17 +659,20 @@ void CloudTablet::recycle_cached_data(const std::vector<RowsetSharedPtr>& rowset
656659
rs->clear_cache();
657660
rowset_ids.push_back(rs->rowset_id());
658661
num_segments.push_back(rs->num_segments());
662+
auto index_names = rs->get_index_file_names();
663+
index_file_names.push_back(index_names);
659664
int64_t segment_size_sum = 0;
660665
for (int32_t i = 0; i < rs->num_segments(); i++) {
661666
segment_size_sum += rs->rowset_meta()->segment_file_size(i);
662667
}
663668
g_file_cache_recycle_cached_data_segment_num << rs->num_segments();
664669
g_file_cache_recycle_cached_data_segment_size << segment_size_sum;
670+
g_file_cache_recycle_cached_data_index_num << index_names.size();
665671
}
666672
if (!rowsets.empty()) {
667673
auto& manager = ExecEnv::GetInstance()->storage_engine().to_cloud().cloud_warm_up_manager();
668-
manager.recycle_cache(rowsets.front()->rowset_meta()->tablet_id(), rowset_ids,
669-
num_segments);
674+
manager.recycle_cache(rowsets.front()->rowset_meta()->tablet_id(), rowset_ids, num_segments,
675+
index_file_names);
670676
}
671677
}
672678

‎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);
@@ -523,8 +525,10 @@ void CloudWarmUpManager::warm_up_rowset(RowsetMeta& rs_meta) {
523525
}
524526
}
525527

526-
void CloudWarmUpManager::recycle_cache(int64_t tablet_id, const std::vector<RowsetId>& rowset_ids,
527-
const std::vector<int64_t>& num_segments) {
528+
void CloudWarmUpManager::recycle_cache(
529+
int64_t tablet_id, const std::vector<RowsetId>& rowset_ids,
530+
const std::vector<int64_t>& num_segments,
531+
const std::vector<std::vector<std::string>>& index_file_names) {
528532
LOG(INFO) << "recycle_cache: tablet_id=" << tablet_id << ", num_rowsets=" << rowset_ids.size();
529533
auto replicas = get_replica_info(tablet_id);
530534
if (replicas.empty()) {
@@ -541,7 +545,11 @@ void CloudWarmUpManager::recycle_cache(int64_t tablet_id, const std::vector<Rows
541545
meta->set_tablet_id(tablet_id);
542546
meta->set_rowset_id(rowset_ids[i].to_string());
543547
meta->set_num_segments(num_segments[i]);
548+
for (const auto& name : index_file_names[i]) {
549+
meta->add_index_file_names(name);
550+
}
544551
g_file_cache_recycle_cache_requested_segment_num << num_segments[i];
552+
g_file_cache_recycle_cache_requested_index_num << index_file_names[i].size();
545553
}
546554
for (auto& replica : replicas) {
547555
// 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
@@ -869,6 +869,7 @@ message RecycleCacheMeta {
869869
optional int64 tablet_id = 1;
870870
optional string rowset_id = 2;
871871
optional int64 num_segments = 3;
872+
repeated string index_file_names = 4;
872873
}
873874

874875
message PRecycleCacheRequest {

0 commit comments

Comments
 (0)