Skip to content

branch-4.1: [fix](cloud) Recycle empty rowsets without resource id #64630 #64643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 1 commit into from
Jun 20, 2026
+38 −7
Merged

branch-4.1: [fix](cloud) Recycle empty rowsets without resource id #64630 #64643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cloud/src/recycler/recycler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4300,24 +4300,24 @@ int InstanceRecycler::recycle_tablet(int64_t tablet_id, RecyclerMetricsContext&
TEST_SYNC_POINT_CALLBACK("InstanceRecycler::recycle_tablet.create_rowset_meta", &resp);

for (const auto& rs_meta : resp.rowset_meta()) {
// The rowset has no resource id and segments when it was generated by compaction
// with multiple hole rowsets or it's version is [0-1], so we can skip it.
if (!rs_meta.has_resource_id() && rs_meta.num_segments() == 0) {
LOG_INFO("rowset meta does not have a resource id and no segments, skip this rowset")
// Empty rowsets have no segment objects to delete, so they do not need a resource id.
if (rs_meta.num_segments() <= 0) {
LOG_INFO("rowset meta has no segments, skip this rowset")
.tag("rs_meta", rs_meta.ShortDebugString())
.tag("instance_id", instance_id_)
.tag("tablet_id", tablet_id);
recycle_rowsets_number += 1;
continue;
}
if (!rs_meta.has_resource_id()) {
LOG_WARNING("rowset meta does not have a resource id, impossible!")
if (!rs_meta.has_resource_id() || rs_meta.resource_id().empty()) {
LOG_WARNING("rowset meta has a missing or empty resource id, impossible!")
.tag("rs_meta", rs_meta.ShortDebugString())
.tag("instance_id", instance_id_)
.tag("tablet_id", tablet_id);
return -1;
}
DCHECK(rs_meta.has_resource_id()) << "rs_meta" << rs_meta.ShortDebugString();
DCHECK(rs_meta.has_resource_id() && !rs_meta.resource_id().empty())
<< "rs_meta" << rs_meta.ShortDebugString();
auto it = accessor_map_.find(rs_meta.resource_id());
// possible if the accessor is not initilized correctly
if (it == accessor_map_.end()) [[unlikely]] {
Expand Down
31 changes: 31 additions & 0 deletions cloud/test/recycler_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6837,6 +6837,37 @@ TEST(RecyclerTest, recycle_tablet_without_resource_id) {
EXPECT_EQ(recycler.accessor_map_.at("success_vault")->exists("data/0/test.csv"), 0);
}

TEST(RecyclerTest, recycle_tablet_with_empty_resource_id_and_no_segments) {
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
sp->clear_all_call_backs();
sp->clear_trace();
sp->disable_processing();
};

auto txn_kv = std::make_shared<MemTxnKv>();
EXPECT_EQ(txn_kv->init(), 0);
InstanceInfoPB instance;
instance.set_instance_id("test_instance");

sp->set_call_back("InstanceRecycler::recycle_tablet.create_rowset_meta", [](auto&& args) {
auto* resp = try_any_cast<GetRowsetResponse*>(args[0]);
auto* rs = resp->add_rowset_meta();
rs->set_num_segments(0);
rs->set_resource_id("");
EXPECT_TRUE(rs->has_resource_id());
EXPECT_TRUE(rs->resource_id().empty());
});
sp->enable_processing();

InstanceRecycler recycler(txn_kv, instance, thread_group,
std::make_shared<TxnLazyCommitter>(txn_kv));
EXPECT_EQ(recycler.init(), 0);

RecyclerMetricsContext ctx;
EXPECT_EQ(recycler.recycle_tablet(0, ctx), 0);
}

TEST(RecyclerTest, recycle_tablet_with_wrong_resource_id) {
auto* sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
Expand Down
Loading