Skip to content

[BugFix] test isolation workgroup manager #67489

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

Open
eshishki wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −0
Open

[BugFix] test isolation workgroup manager #67489

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
7 changes: 7 additions & 0 deletions be/test/agent/resource_group_usage_recorder_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@ TEST(ResourceGroupUsageRecorderTest, test_get_resource_group_usages) {
const size_t num_cores = CpuInfo::num_cores();

auto& exec_env = *ExecEnv::GetInstance();
// Save original workgroup_manager to restore at end (otherwise subsequent tests fail)
auto original_wg_manager = std::move(exec_env._workgroup_manager);

workgroup::PipelineExecutorSetConfig executors_manager_opts(
CpuInfo::num_cores(), num_cores, num_cores, num_cores, CpuInfo::get_core_ids(), true,
config::enable_resource_group_cpu_borrowing, StarRocksMetrics::instance()->get_pipeline_executor_metrics());
exec_env._workgroup_manager = std::make_unique<workgroup::WorkGroupManager>(std::move(executors_manager_opts));
ASSERT_TRUE(exec_env._workgroup_manager->start().ok());

workgroup::DefaultWorkGroupInitialization default_workgroup_init;
auto default_wg = exec_env.workgroup_manager()->get_default_workgroup();
Expand All @@ -43,6 +47,9 @@ TEST(ResourceGroupUsageRecorderTest, test_get_resource_group_usages) {
ASSERT_EQ(group_usages[0].mem_pool, workgroup::WorkGroup::DEFAULT_MEM_POOL);
ASSERT_EQ(group_usages[0].mem_limit_bytes, default_wg->mem_limit_bytes());
ASSERT_EQ(group_usages[0].mem_pool_mem_limit_bytes, default_wg->mem_limit_bytes());

// Restore original workgroup_manager
exec_env._workgroup_manager = std::move(original_wg_manager);
}

} // namespace starrocks
1 change: 1 addition & 0 deletions be/test/exec/pipeline/pipeline_file_scan_node_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class PipeLineFileScanNodeTest : public ::testing::Test {
_fragment_ctx->set_runtime_state(
std::make_unique<RuntimeState>(_request.params.query_id, _request.params.fragment_instance_id,
_request.query_options, _request.query_globals, _exec_env));
_fragment_ctx->set_workgroup(ExecEnv::GetInstance()->workgroup_manager()->get_default_workgroup());

_fragment_future = _fragment_ctx->finish_future();
_runtime_state = _fragment_ctx->runtime_state();
Expand Down
Loading