Skip to content

[native] Deprecate kQueryMaxTotalMemoryPerNode config #18842

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
amitkdutta merged 1 commit into from
Dec 25, 2022
Merged

[native] Deprecate kQueryMaxTotalMemoryPerNode config #18842

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: 3 additions & 4 deletions presto-native-execution/presto_cpp/main/QueryContextManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,12 @@ std::shared_ptr<core::QueryCtx> QueryContextManager::findOrCreateQueryCtx(
{entry.first, std::make_shared<core::MemConfig>(entry.second)});
}

const int64_t maxTotalMemoryPerNode = getMaxMemoryPerNode(
kQueryMaxTotalMemoryPerNode, kDefaultMaxMemoryPerNode);

const int64_t maxQueryMemoryPerNode =
getMaxMemoryPerNode(kQueryMaxMemoryPerNode, kDefaultMaxMemoryPerNode);
auto pool =
memory::getProcessDefaultMemoryManager().getRoot().addChild("query_root");
pool->setMemoryUsageTracker(
velox::memory::MemoryUsageTracker::create(maxTotalMemoryPerNode));
velox::memory::MemoryUsageTracker::create(maxQueryMemoryPerNode));

auto queryCtx = std::make_shared<core::QueryCtx>(
executor().get(),
Expand Down
2 changes: 0 additions & 2 deletions presto-native-execution/presto_cpp/main/QueryContextManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ class QueryContextManager {

static constexpr const char* kQueryMaxMemoryPerNode =
"query.max-memory-per-node";
static constexpr const char* kQueryMaxTotalMemoryPerNode =
"query.max-total-memory-per-node";
static constexpr int64_t kDefaultMaxMemoryPerNode =
std::numeric_limits<int64_t>::max();

Expand Down
16 changes: 5 additions & 11 deletions presto-native-execution/presto_cpp/main/tests/TaskManagerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ class TaskManagerTest : public testing::Test {
} else {
auto resultsOrFailures =
fetchAllResults(outputTaskInfo->taskId, finalOutputType, allTaskIds);
EXPECT_TRUE(resultsOrFailures.status != nullptr);
EXPECT_EQ(resultsOrFailures.status->state, protocol::TaskState::FAILED);
for (const auto& taskId : allTaskIds) {
taskManager_->deleteTask(taskId, true);
Expand Down Expand Up @@ -512,13 +513,10 @@ class TaskManagerTest : public testing::Test {
taskInfo->stats.peakTotalMemoryInBytes);
}

void setMemoryLimits(uint64_t userMax, uint64_t totalMax) {
void setMemoryLimits(uint64_t maxMemory) {
taskManager_->getQueryContextManager()->overrideProperties(
QueryContextManager::kQueryMaxMemoryPerNode,
fmt::format("{}B", userMax));
taskManager_->getQueryContextManager()->overrideProperties(
QueryContextManager::kQueryMaxTotalMemoryPerNode,
fmt::format("{}B", totalMax));
fmt::format("{}B", maxMemory));
}

// Setup the temporary spilling directory and initialize the system config
Expand Down Expand Up @@ -696,15 +694,11 @@ TEST_F(TaskManagerTest, outOfQueryUserMemory) {

auto [peakUser, peakTotal] = testCountAggregation("initial", filePaths);

setMemoryLimits(peakUser - 1, 20 * kGB);
setMemoryLimits(peakUser - 1);
testCountAggregation("max-memory", filePaths, {}, true);

// Verify query.max-total-memory-per-node is respected.
setMemoryLimits(20 * kGB, peakTotal - 1);
testCountAggregation("max-total-memory", filePaths, {}, true);

// Verify the query is successful with some limits.
setMemoryLimits(20 * kGB, 20 * kGB);
setMemoryLimits(20 * kGB);
testCountAggregation("test-count-aggr", filePaths);

// Wait a little to allow for futures to complete.
Expand Down