From c8ac5fdbb9a6bff96e1cfefc043b1b1e63a5ee73 Mon Sep 17 00:00:00 2001 From: yangtao555 Date: Tue, 17 Nov 2026 17:52:43 +0800 Subject: [PATCH] [fix](tablet) Count stale rowsets correctly in metadata size checks --- be/src/storage/tablet/tablet_meta.h | 2 +- .../load/delta_writer/delta_writer_test.cpp | 55 +++++++++++++++++++ be/test/storage/tablet/tablet_meta_test.cpp | 29 ++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/be/src/storage/tablet/tablet_meta.h b/be/src/storage/tablet/tablet_meta.h index 2c7b1720c78ce8..484f47e5b14a0a 100644 --- a/be/src/storage/tablet/tablet_meta.h +++ b/be/src/storage/tablet/tablet_meta.h @@ -842,7 +842,7 @@ inline size_t TabletMeta::version_count() const { } inline size_t TabletMeta::stale_version_count() const { - return _rs_metas.size(); + return _stale_rs_metas.size(); } inline TabletState TabletMeta::tablet_state() const { diff --git a/be/test/load/delta_writer/delta_writer_test.cpp b/be/test/load/delta_writer/delta_writer_test.cpp index 555aad7d5e1e4c..e08a9367812668 100644 --- a/be/test/load/delta_writer/delta_writer_test.cpp +++ b/be/test/load/delta_writer/delta_writer_test.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -53,6 +54,7 @@ #include "storage/olap_define.h" #include "storage/options.h" #include "storage/rowset/beta_rowset.h" +#include "storage/rowset/rowset_writer.h" #include "storage/rowset_builder.h" #include "storage/schema.h" #include "storage/segment/segment.h" @@ -62,6 +64,7 @@ #include "storage/tablet_info.h" #include "storage/task/engine_publish_version_task.h" #include "storage/txn/txn_manager.h" +#include "util/defer_op.h" namespace doris { class OlapMeta; @@ -542,6 +545,58 @@ TEST_F(TestDeltaWriter, open) { EXPECT_EQ(Status::OK(), res); } +TEST_F(TestDeltaWriter, metadata_size_limit_without_stale_rowsets) { + RuntimeProfile profile("MetadataSizeLimit"); + TCreateTabletReq request; + create_tablet_request(10007, 270068378, &request); + ASSERT_TRUE(engine_ref->create_tablet(request, &profile).ok()); + auto tablet = engine_ref->tablet_manager()->get_tablet(request.tablet_id); + ASSERT_NE(nullptr, tablet); + ASSERT_FALSE(tablet->enable_unique_key_merge_on_write()); + + std::string serialized_meta; + { + std::unique_lock lock(tablet->get_header_lock()); + tablet->tablet_meta()->serialize(&serialized_meta); + } + ASSERT_EQ(1, tablet->version_count()); + ASSERT_GT(tablet->avg_rs_meta_serialize_size(), 0); + + const auto original_limit = config::tablet_meta_serialize_size_limit; + Defer restore_limit( + [original_limit] { config::tablet_meta_serialize_size_limit = original_limit; }); + + WriteRequest write_req; + write_req.tablet_id = request.tablet_id; + write_req.schema_hash = request.tablet_schema.schema_hash; + write_req.partition_id = request.partition_id; + write_req.txn_id = 20007; + write_req.table_schema_param = std::make_shared(); + + // A single active rowset must be counted once: reject below its size and allow equality. + config::tablet_meta_serialize_size_limit = tablet->avg_rs_meta_serialize_size() - 1; + { + RowsetBuilder builder(*engine_ref, write_req, &profile); + auto status = builder.init(); + ASSERT_TRUE(status.is()) << status; + ASSERT_NE(std::string::npos, status.to_string().find("meta serialize size")) << status; + } + + config::tablet_meta_serialize_size_limit = tablet->avg_rs_meta_serialize_size(); + { + RowsetBuilder builder(*engine_ref, write_req, &profile); + auto status = builder.init(); + ASSERT_TRUE(status.ok()) << status; + ASSERT_TRUE(builder.rowset_writer()->flush().ok()); + ASSERT_TRUE(builder.build_rowset().ok()); + ASSERT_TRUE(builder.commit_txn().ok()); + } + + ASSERT_TRUE(engine_ref->tablet_manager() + ->drop_tablet(request.tablet_id, request.replica_id, false) + .ok()); +} + TEST_F(TestDeltaWriter, vec_write) { std::unique_ptr profile; profile = std::make_unique("CreateTablet"); diff --git a/be/test/storage/tablet/tablet_meta_test.cpp b/be/test/storage/tablet/tablet_meta_test.cpp index 33990a7097a349..3d1ad967c1c68a 100644 --- a/be/test/storage/tablet/tablet_meta_test.cpp +++ b/be/test/storage/tablet/tablet_meta_test.cpp @@ -34,6 +34,35 @@ namespace doris { +TEST(TabletMetaTest, ActiveAndStaleVersionCountsFollowCompactionLifecycle) { + TabletMeta tablet_meta; + EXPECT_EQ(0, tablet_meta.version_count()); + EXPECT_EQ(0, tablet_meta.stale_version_count()); + + auto first = std::make_shared(); + auto second = std::make_shared(); + auto merged = std::make_shared(); + first->set_version(Version(1, 1)); + second->set_version(Version(2, 2)); + merged->set_version(Version(1, 2)); + ASSERT_TRUE(tablet_meta.add_rs_meta(first).ok()); + ASSERT_TRUE(tablet_meta.add_rs_meta(second).ok()); + EXPECT_EQ(2, tablet_meta.version_count()); + EXPECT_EQ(0, tablet_meta.stale_version_count()); + + tablet_meta.modify_rs_metas({merged}, {first, second}); + EXPECT_EQ(1, tablet_meta.version_count()); + EXPECT_EQ(2, tablet_meta.stale_version_count()); + + tablet_meta.delete_stale_rs_meta_by_version(Version(1, 1)); + EXPECT_EQ(1, tablet_meta.version_count()); + EXPECT_EQ(1, tablet_meta.stale_version_count()); + + tablet_meta.delete_stale_rs_meta_by_version(Version(2, 2)); + EXPECT_EQ(1, tablet_meta.version_count()); + EXPECT_EQ(0, tablet_meta.stale_version_count()); +} + TEST(TabletMetaTest, SaveAndParse) { std::string meta_path = "./be/test/storage/test_data/tablet_meta_test.hdr";