This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 309503855e9eae0e6a7dc5edef23c43d3802cbe5 Author: abmdocrt <[email protected]> AuthorDate: Thu May 23 16:45:46 2024 +0800 [Fix](bloom filter) Fix bloom filter memory leak (#34871) * Issue: Doris occasionally encounters an issue where memory usage becomes exceptionally high and does not decrease. The leaked memory is occupied by Bloom filters stored in memory. Reason: The segment cache stores segment objects read from files into memory. It functions as an LRU cache with an eviction strategy: when the number of segments exceeds the maximum number, or the total memory size of segment objects in the cache exceeds the maximum usage, it evicts the older segments. However, there is a piece of logic in the code that first reads the segment object into memory, assuming it occupies memory size A, then places the read segment object into the cache (a [...] Solution: Since each segment object only reads the Bloom filter once, the issue can be resolved by changing the logic from reading the segment, placing it into the cache, and then reading the Bloom filter to reading the segment, reading the Bloom filter, and then placing it into the cache. --- be/src/olap/rowset/segment_v2/segment.cpp | 10 + be/src/olap/segment_loader.cpp | 8 +- be/src/olap/segment_loader.h | 7 +- be/test/olap/segment_cache_test.cpp | 361 ++++++++++++++++++++++++++++++ 4 files changed, 384 insertions(+), 2 deletions(-) diff --git a/be/src/olap/rowset/segment_v2/segment.cpp b/be/src/olap/rowset/segment_v2/segment.cpp index bed5b53145b..7893028a397 100644 --- a/be/src/olap/rowset/segment_v2/segment.cpp +++ b/be/src/olap/rowset/segment_v2/segment.cpp @@ -285,6 +285,15 @@ Status Segment::_parse_footer(SegmentFooterPB* footer) { } Status Segment::_load_pk_bloom_filter() { +#ifdef BE_TEST + if (_pk_index_meta == nullptr) { + // for BE UT "segment_cache_test" + return _load_pk_bf_once.call([this] { + _meta_mem_usage += 100; + return Status::OK(); + }); + } +#endif DCHECK(_tablet_schema->keys_type() == UNIQUE_KEYS); DCHECK(_pk_index_meta != nullptr); DCHECK(_pk_index_reader != nullptr); @@ -314,6 +323,7 @@ Status Segment::load_pk_index_and_bf() { RETURN_IF_ERROR(_load_pk_bloom_filter()); return Status::OK(); } + Status Segment::load_index() { auto status = [this]() { return _load_index_impl(); }(); if (!status.ok()) { diff --git a/be/src/olap/segment_loader.cpp b/be/src/olap/segment_loader.cpp index cb076f28225..fd7e3f476ad 100644 --- a/be/src/olap/segment_loader.cpp +++ b/be/src/olap/segment_loader.cpp @@ -18,6 +18,7 @@ #include "olap/segment_loader.h" #include "common/config.h" +#include "common/status.h" #include "olap/olap_define.h" #include "olap/rowset/beta_rowset.h" #include "util/stopwatch.hpp" @@ -50,7 +51,8 @@ void SegmentCache::erase(const SegmentCache::CacheKey& key) { } Status SegmentLoader::load_segments(const BetaRowsetSharedPtr& rowset, - SegmentCacheHandle* cache_handle, bool use_cache) { + SegmentCacheHandle* cache_handle, bool use_cache, + bool need_load_pk_index_and_bf) { if (cache_handle->is_inited()) { return Status::OK(); } @@ -61,9 +63,13 @@ Status SegmentLoader::load_segments(const BetaRowsetSharedPtr& rowset, } segment_v2::SegmentSharedPtr segment; RETURN_IF_ERROR(rowset->load_segment(i, &segment)); + if (need_load_pk_index_and_bf) { + RETURN_IF_ERROR(segment->load_pk_index_and_bf()); + } if (use_cache && !config::disable_segment_cache) { // memory of SegmentCache::CacheValue will be handled by SegmentCache auto* cache_value = new SegmentCache::CacheValue(); + _cache_mem_usage += segment->meta_mem_usage(); cache_value->segment = std::move(segment); _segment_cache->insert(cache_key, *cache_value, cache_handle); } else { diff --git a/be/src/olap/segment_loader.h b/be/src/olap/segment_loader.h index 00fcbaf46e9..cd0f7799abe 100644 --- a/be/src/olap/segment_loader.h +++ b/be/src/olap/segment_loader.h @@ -114,15 +114,20 @@ public: // Load segments of "rowset", return the "cache_handle" which contains segments. // If use_cache is true, it will be loaded from _cache. Status load_segments(const BetaRowsetSharedPtr& rowset, SegmentCacheHandle* cache_handle, - bool use_cache = false); + bool use_cache = false, bool need_load_pk_index_and_bf = false); void erase_segment(const SegmentCache::CacheKey& key); void erase_segments(const RowsetId& rowset_id, int64_t num_segments); + // Just used for BE UT + int64_t cache_mem_usage() const { return _cache_mem_usage; } + private: SegmentLoader(); std::unique_ptr<SegmentCache> _segment_cache; + // Just used for BE UT + int64_t _cache_mem_usage = 0; }; // A handle for a single rowset from segment lru cache. diff --git a/be/test/olap/segment_cache_test.cpp b/be/test/olap/segment_cache_test.cpp new file mode 100644 index 00000000000..567780f2f33 --- /dev/null +++ b/be/test/olap/segment_cache_test.cpp @@ -0,0 +1,361 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +#include <gen_cpp/AgentService_types.h> +#include <gtest/gtest-message.h> +#include <gtest/gtest-test-part.h> +#include <stdlib.h> +#include <unistd.h> + +#include <iostream> +#include <map> +#include <memory> +#include <mutex> +#include <string> +#include <utility> + +#include "common/config.h" +#include "common/object_pool.h" +#include "exec/tablet_info.h" +#include "gen_cpp/Descriptors_types.h" +#include "gen_cpp/Types_types.h" +#include "gen_cpp/internal_service.pb.h" +#include "gtest/gtest_pred_impl.h" +#include "io/fs/local_file_system.h" +#include "olap/data_dir.h" +#include "olap/delta_writer.h" +#include "olap/iterators.h" +#include "olap/olap_define.h" +#include "olap/options.h" +#include "olap/rowset/beta_rowset.h" +#include "olap/rowset/segment_v2/segment.h" +#include "olap/schema.h" +#include "olap/segment_loader.h" +#include "olap/storage_engine.h" +#include "olap/tablet.h" +#include "olap/tablet_manager.h" +#include "olap/task/engine_publish_version_task.h" +#include "olap/txn_manager.h" +#include "runtime/define_primitive_type.h" +#include "runtime/descriptor_helper.h" +#include "runtime/descriptors.h" +#include "runtime/exec_env.h" +#include "vec/columns/column.h" +#include "vec/core/block.h" +#include "vec/core/column_with_type_and_name.h" +#include "vec/runtime/vdatetime_value.h" + +namespace doris { +class OlapMeta; + +// This is DeltaWriter unit test which used by streaming load. +// And also it should take schema change into account after streaming load. + +static const uint32_t MAX_PATH_LEN = 1024; +static StorageEngine* engine_ref = nullptr; + +static void set_up() { + char buffer[MAX_PATH_LEN]; + EXPECT_NE(getcwd(buffer, MAX_PATH_LEN), nullptr); + config::storage_root_path = std::string(buffer) + "/segment_cache_test"; + auto st = io::global_local_filesystem()->delete_directory(config::storage_root_path); + ASSERT_TRUE(st.ok()) << st; + st = io::global_local_filesystem()->create_directory(config::storage_root_path); + ASSERT_TRUE(st.ok()) << st; + std::vector<StorePath> paths; + paths.emplace_back(config::storage_root_path, -1); + + doris::EngineOptions options; + options.store_paths = paths; + auto engine = std::make_unique<StorageEngine>(options); + engine_ref = engine.get(); + Status s = engine->open(); + ASSERT_TRUE(s.ok()) << s; + ASSERT_TRUE(s.ok()) << s; + + ExecEnv* exec_env = doris::ExecEnv::GetInstance(); + exec_env->set_memtable_memory_limiter(new MemTableMemoryLimiter()); + exec_env->set_storage_engine(std::move(engine)); +} + +static void tear_down() { + ExecEnv* exec_env = doris::ExecEnv::GetInstance(); + exec_env->set_memtable_memory_limiter(nullptr); + engine_ref = nullptr; + exec_env->set_storage_engine(nullptr); + EXPECT_EQ(system("rm -rf ./segment_cache_test"), 0); + static_cast<void>(io::global_local_filesystem()->delete_directory( + std::string(getenv("DORIS_HOME")) + "/" + UNUSED_PREFIX)); +} + +static void create_tablet_request_with_sequence_col(int64_t tablet_id, int32_t schema_hash, + TCreateTabletReq* request, + bool enable_mow = false) { + request->tablet_id = tablet_id; + request->__set_version(1); + request->partition_id = 30004; + request->tablet_schema.schema_hash = schema_hash; + request->tablet_schema.short_key_column_count = 2; + request->tablet_schema.keys_type = TKeysType::UNIQUE_KEYS; + request->tablet_schema.storage_type = TStorageType::COLUMN; + request->tablet_schema.__set_sequence_col_idx(4); + request->__set_storage_format(TStorageFormat::V2); + request->__set_enable_unique_key_merge_on_write(enable_mow); + + TColumn k1; + k1.column_name = "k1"; + k1.__set_is_key(true); + k1.column_type.type = TPrimitiveType::TINYINT; + request->tablet_schema.columns.push_back(k1); + + TColumn k2; + k2.column_name = "k2"; + k2.__set_is_key(true); + k2.column_type.type = TPrimitiveType::SMALLINT; + request->tablet_schema.columns.push_back(k2); + + TColumn v1; + v1.column_name = "v1"; + v1.__set_is_key(false); + v1.column_type.type = TPrimitiveType::DATETIME; + v1.__set_aggregation_type(TAggregationType::REPLACE); + request->tablet_schema.columns.push_back(v1); + + TColumn v2; + v2.column_name = "v2"; + v2.__set_is_key(false); + v2.column_type.type = TPrimitiveType::DATEV2; + v2.__set_aggregation_type(TAggregationType::REPLACE); + request->tablet_schema.columns.push_back(v2); + + TColumn sequence_col; + sequence_col.column_name = SEQUENCE_COL; + sequence_col.__set_is_key(false); + sequence_col.column_type.type = TPrimitiveType::INT; + sequence_col.__set_aggregation_type(TAggregationType::REPLACE); + request->tablet_schema.columns.push_back(sequence_col); +} + +static TDescriptorTable create_descriptor_tablet_with_sequence_col() { + TDescriptorTableBuilder dtb; + TTupleDescriptorBuilder tuple_builder; + + tuple_builder.add_slot( + TSlotDescriptorBuilder().type(TYPE_TINYINT).column_name("k1").column_pos(0).build()); + tuple_builder.add_slot( + TSlotDescriptorBuilder().type(TYPE_SMALLINT).column_name("k2").column_pos(1).build()); + tuple_builder.add_slot(TSlotDescriptorBuilder() + .type(TYPE_DATETIME) + .column_name("v1") + .column_pos(2) + .nullable(false) + .build()); + tuple_builder.add_slot(TSlotDescriptorBuilder() + .type(TYPE_DATEV2) + .column_name("v2") + .column_pos(3) + .nullable(false) + .build()); + tuple_builder.add_slot(TSlotDescriptorBuilder() + .type(TYPE_INT) + .column_name(SEQUENCE_COL) + .column_pos(4) + .nullable(false) + .build()); + tuple_builder.build(&dtb); + + return dtb.desc_tbl(); +} + +static void generate_data(vectorized::Block* block, int8_t k1, int16_t k2, int32_t seq) { + auto columns = block->mutate_columns(); + int8_t c1 = k1; + columns[0]->insert_data((const char*)&c1, sizeof(c1)); + + int16_t c2 = k2; + columns[1]->insert_data((const char*)&c2, sizeof(c2)); + + VecDateTimeValue c3; + c3.from_date_str("2020-07-16 19:39:43", 19); + int64_t c3_int = c3.to_int64(); + columns[2]->insert_data((const char*)&c3_int, sizeof(c3)); + + DateV2Value<DateV2ValueType> c4; + c4.set_time(2022, 6, 6, 0, 0, 0, 0); + uint32_t c4_int = c4.to_date_int_val(); + columns[3]->insert_data((const char*)&c4_int, sizeof(c4)); + + int32_t c5 = seq; + columns[4]->insert_data((const char*)&c5, sizeof(c2)); +} + +class SegmentCacheTest : public ::testing::Test { +public: + SegmentCacheTest() = default; + ~SegmentCacheTest() = default; + static void SetUpTestSuite() { + config::min_file_descriptor_number = 100; + set_up(); + } + + static void TearDownTestSuite() { tear_down(); } +}; + +TEST_F(SegmentCacheTest, vec_sequence_col) { + std::unique_ptr<RuntimeProfile> profile; + profile = std::make_unique<RuntimeProfile>("CreateTablet"); + TCreateTabletReq request; + sleep(20); + create_tablet_request_with_sequence_col(55555, 270068377, &request); + Status res = engine_ref->create_tablet(request, profile.get()); + ASSERT_TRUE(res.ok()); + + TDescriptorTable tdesc_tbl = create_descriptor_tablet_with_sequence_col(); + ObjectPool obj_pool; + DescriptorTbl* desc_tbl = nullptr; + static_cast<void>(DescriptorTbl::create(&obj_pool, tdesc_tbl, &desc_tbl)); + TupleDescriptor* tuple_desc = desc_tbl->get_tuple_descriptor(0); + auto param = std::make_shared<OlapTableSchemaParam>(); + + PUniqueId load_id; + load_id.set_hi(0); + load_id.set_lo(0); + WriteRequest write_req; + write_req.tablet_id = 55555; + write_req.schema_hash = 270068377; + write_req.txn_id = 20003; + write_req.partition_id = 30003; + write_req.load_id = load_id; + write_req.tuple_desc = tuple_desc; + write_req.slots = &(tuple_desc->slots()); + write_req.is_high_priority = false; + write_req.table_schema_param = param; + profile = std::make_unique<RuntimeProfile>("LoadChannels"); + auto delta_writer = + std::make_unique<DeltaWriter>(*engine_ref, write_req, profile.get(), TUniqueId {}); + + vectorized::Block block; + for (const auto& slot_desc : tuple_desc->slots()) { + block.insert(vectorized::ColumnWithTypeAndName(slot_desc->get_empty_mutable_column(), + slot_desc->get_data_type_ptr(), + slot_desc->col_name())); + } + + generate_data(&block, 123, 456, 100); + res = delta_writer->write(&block, {0}); + EXPECT_TRUE(res.ok()); + + generate_data(&block, 123, 456, 90); + res = delta_writer->write(&block, {1}); + ASSERT_TRUE(res.ok()); + + res = delta_writer->close(); + ASSERT_TRUE(res.ok()); + res = delta_writer->wait_flush(); + ASSERT_TRUE(res.ok()); + res = delta_writer->build_rowset(); + ASSERT_TRUE(res.ok()); + res = delta_writer->submit_calc_delete_bitmap_task(); + ASSERT_TRUE(res.ok()); + res = delta_writer->wait_calc_delete_bitmap(); + ASSERT_TRUE(res.ok()); + res = delta_writer->commit_txn(PSlaveTabletNodes()); + ASSERT_TRUE(res.ok()); + + // publish version success + TabletSharedPtr tablet = engine_ref->tablet_manager()->get_tablet(write_req.tablet_id); + std::cout << "before publish, tablet row nums:" << tablet->num_rows() << std::endl; + OlapMeta* meta = tablet->data_dir()->get_meta(); + Version version; + version.first = tablet->get_rowset_with_max_version()->end_version() + 1; + version.second = tablet->get_rowset_with_max_version()->end_version() + 1; + std::cout << "start to add rowset version:" << version.first << "-" << version.second + << std::endl; + std::map<TabletInfo, RowsetSharedPtr> tablet_related_rs; + engine_ref->txn_manager()->get_txn_related_tablets(write_req.txn_id, write_req.partition_id, + &tablet_related_rs); + ASSERT_EQ(1, tablet_related_rs.size()); + + std::cout << "start to publish txn" << std::endl; + RowsetSharedPtr rowset = tablet_related_rs.begin()->second; + TabletPublishStatistics pstats; + res = engine_ref->txn_manager()->publish_txn( + meta, write_req.partition_id, write_req.txn_id, write_req.tablet_id, + tablet_related_rs.begin()->first.tablet_uid, version, &pstats); + ASSERT_TRUE(res.ok()); + std::cout << "start to add inc rowset:" << rowset->rowset_id() + << ", num rows:" << rowset->num_rows() << ", version:" << rowset->version().first + << "-" << rowset->version().second << std::endl; + res = tablet->add_inc_rowset(rowset); + ASSERT_TRUE(res.ok()); + ASSERT_EQ(1, tablet->num_rows()); + std::vector<segment_v2::SegmentSharedPtr> segments; + + SegmentCacheHandle handle; + BetaRowsetSharedPtr rowset_ptr = std::dynamic_pointer_cast<BetaRowset>(rowset); + + std::mutex lock; + { + // Use lock to make sure only this segment can be loaded by SegmentLoader during this test. + // SegmeentLoader is singleton. Without this lock, multiple segments will be loaded. Result will be wrong. + std::lock_guard<std::mutex> l(lock); + // load segments first + int64_t start_size = SegmentLoader::instance()->cache_mem_usage(); + res = SegmentLoader::instance()->load_segments(rowset_ptr, &handle, true, true); + ASSERT_TRUE(res.ok()); + EXPECT_EQ(1, rowset->num_segments()); + EXPECT_EQ(1, handle.get_segments().size()); + EXPECT_TRUE(handle.is_inited()); + segment_v2::SegmentSharedPtr segment_ptr = handle.get_segments()[0]; + + // load index and bf second + res = segment_ptr->load_pk_index_and_bf(); + ASSERT_TRUE(res.ok()); + + // check cache mem usage equals to segment mem usage + EXPECT_EQ(SegmentLoader::instance()->cache_mem_usage() - start_size, + segment_ptr->meta_mem_usage()); + } + + res = ((BetaRowset*)rowset.get())->load_segments(&segments); + ASSERT_TRUE(res.ok()); + ASSERT_EQ(1, rowset->num_segments()); + ASSERT_EQ(1, segments.size()); + + // read data, verify the data correct + OlapReaderStatistics stats; + StorageReadOptions opts; + opts.stats = &stats; + opts.tablet_schema = rowset->tablet_schema(); + + std::unique_ptr<RowwiseIterator> iter; + std::shared_ptr<Schema> schema = std::make_shared<Schema>(rowset->tablet_schema()); + auto s = segments[0]->new_iterator(schema, opts, &iter); + ASSERT_TRUE(s.ok()); + auto read_block = rowset->tablet_schema()->create_block(); + res = iter->next_batch(&read_block); + ASSERT_TRUE(res.ok()) << res; + ASSERT_EQ(1, read_block.rows()); + // get the value from sequence column + auto seq_v = read_block.get_by_position(4).column->get_int(0); + ASSERT_EQ(100, seq_v); + + res = engine_ref->tablet_manager()->drop_tablet(request.tablet_id, request.replica_id, false); + ASSERT_TRUE(res.ok()); +} + +} // namespace doris --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
