-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fix](compaction) fixing the inaccurate statistics of concurrent comp…
…action tasks (#37318) Specify the specific stages of compaction tasks and accurately count concurrent tasks only while they are actively running
- Loading branch information
1 parent
b4ba2d0
commit 4434b09
Showing
8 changed files
with
185 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| // 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 <gmock/gmock-actions.h> | ||
| #include <gmock/gmock-matchers.h> | ||
| #include <gtest/gtest-message.h> | ||
| #include <gtest/gtest-test-part.h> | ||
| #include <gtest/gtest.h> | ||
|
|
||
| #include <filesystem> | ||
| #include <memory> | ||
|
|
||
| #include "common/status.h" | ||
| #include "common/sync_point.h" | ||
| #include "gtest/gtest_pred_impl.h" | ||
| #include "io/fs/local_file_system.h" | ||
| #include "olap/cumulative_compaction_policy.h" | ||
| #include "olap/data_dir.h" | ||
| #include "olap/rowset/rowset_factory.h" | ||
| #include "olap/storage_engine.h" | ||
| #include "olap/tablet_manager.h" | ||
| #include "util/threadpool.h" | ||
|
|
||
| namespace doris { | ||
| using namespace config; | ||
|
|
||
| class CompactionTaskTest : public testing::Test { | ||
| public: | ||
| virtual void SetUp() { | ||
| _engine_data_path = "./be/test/olap/test_data/converter_test_data/tmp"; | ||
| auto st = io::global_local_filesystem()->delete_directory(_engine_data_path); | ||
| ASSERT_TRUE(st.ok()) << st; | ||
| st = io::global_local_filesystem()->create_directory(_engine_data_path); | ||
| ASSERT_TRUE(st.ok()) << st; | ||
| EXPECT_TRUE( | ||
| io::global_local_filesystem()->create_directory(_engine_data_path + "/meta").ok()); | ||
|
|
||
| EngineOptions options; | ||
| options.backend_uid = UniqueId::gen_uid(); | ||
| _storage_engine = std::make_unique<StorageEngine>(options); | ||
| _data_dir = std::make_unique<DataDir>(*_storage_engine, _engine_data_path, 100000000); | ||
| static_cast<void>(_data_dir->init()); | ||
| } | ||
|
|
||
| virtual void TearDown() { | ||
| EXPECT_TRUE(io::global_local_filesystem()->delete_directory(_engine_data_path).ok()); | ||
| ExecEnv::GetInstance()->set_storage_engine(nullptr); | ||
| } | ||
|
|
||
| std::unique_ptr<StorageEngine> _storage_engine; | ||
| std::string _engine_data_path; | ||
| std::unique_ptr<DataDir> _data_dir; | ||
| }; | ||
|
|
||
| static RowsetSharedPtr create_rowset(Version version, int num_segments, bool overlapping, | ||
| int data_size) { | ||
| auto rs_meta = std::make_shared<RowsetMeta>(); | ||
| rs_meta->set_rowset_type(BETA_ROWSET); // important | ||
| rs_meta->_rowset_meta_pb.set_start_version(version.first); | ||
| rs_meta->_rowset_meta_pb.set_end_version(version.second); | ||
| rs_meta->set_num_segments(num_segments); | ||
| rs_meta->set_segments_overlap(overlapping ? OVERLAPPING : NONOVERLAPPING); | ||
| rs_meta->set_total_disk_size(data_size); | ||
| RowsetSharedPtr rowset; | ||
| Status st = RowsetFactory::create_rowset(nullptr, "", std::move(rs_meta), &rowset); | ||
| if (!st.ok()) { | ||
| return nullptr; | ||
| } | ||
| return rowset; | ||
| } | ||
|
|
||
| TEST_F(CompactionTaskTest, TestSubmitCompactionTask) { | ||
| auto st = ThreadPoolBuilder("BaseCompactionTaskThreadPool") | ||
| .set_min_threads(2) | ||
| .set_max_threads(2) | ||
| .build(&_storage_engine->_base_compaction_thread_pool); | ||
| EXPECT_TRUE(st.OK()); | ||
| st = ThreadPoolBuilder("CumuCompactionTaskThreadPool") | ||
| .set_min_threads(2) | ||
| .set_max_threads(2) | ||
| .build(&_storage_engine->_cumu_compaction_thread_pool); | ||
| EXPECT_TRUE(st.OK()); | ||
|
|
||
| auto* sp = SyncPoint::get_instance(); | ||
| sp->enable_processing(); | ||
| sp->set_call_back("olap_server::execute_compaction", [](auto&& values) { | ||
| std::this_thread::sleep_for(std::chrono::seconds(10)); | ||
| bool* pred = try_any_cast<bool*>(values.back()); | ||
| *pred = true; | ||
| }); | ||
|
|
||
| for (int tablet_cnt = 0; tablet_cnt < 10; ++tablet_cnt) { | ||
| TabletMetaSharedPtr tablet_meta; | ||
| tablet_meta.reset(new TabletMeta(1, 2, 15673, 15674, 4, 5, TTabletSchema(), 6, {{7, 8}}, | ||
| UniqueId(9, 10), TTabletType::TABLET_TYPE_DISK, | ||
| TCompressionType::LZ4F)); | ||
| TabletSharedPtr tablet(new Tablet(*(_storage_engine.get()), tablet_meta, _data_dir.get(), | ||
| CUMULATIVE_SIZE_BASED_POLICY)); | ||
| st = tablet->init(); | ||
| EXPECT_TRUE(st.OK()); | ||
|
|
||
| for (int i = 2; i < 30; ++i) { | ||
| RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024); | ||
| tablet->_rs_version_map.emplace(rs->version(), rs); | ||
| } | ||
| tablet->_cumulative_point = 2; | ||
|
|
||
| st = _storage_engine->_submit_compaction_task(tablet, CompactionType::CUMULATIVE_COMPACTION, | ||
| false); | ||
| EXPECT_TRUE(st.OK()); | ||
| } | ||
|
|
||
| int executing_task_num = _storage_engine->_get_executing_compaction_num( | ||
| _storage_engine->_tablet_submitted_cumu_compaction[_data_dir.get()]); | ||
| EXPECT_EQ(executing_task_num, 2); | ||
| } | ||
|
|
||
| } // namespace doris |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters