Skip to content

Reset current_memory_tracker when WNEstablishDisaggTaskHandler finished. (#8174) #8175

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
ti-chi-bot merged 2 commits into from
Oct 10, 2023
Merged

Reset current_memory_tracker when WNEstablishDisaggTaskHandler finished. (#8174) #8175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a9dea6
Reset current_memory_tracker when WNEstablishDisaggTaskHandler finished.
JinheLin Oct 9, 2023
6d40c95
RefinE
JinheLin Oct 9, 2023
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 dbms/src/Flash/FlashService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,9 +889,6 @@ grpc::Status FlashService::EstablishDisaggTask(
DM::DisaggTaskId task_id(meta);
auto logger = Logger::get(task_id);

auto handler = std::make_shared<WNEstablishDisaggTaskHandler>(db_context, task_id);
SCOPE_EXIT({ current_memory_tracker = nullptr; });

auto record_other_error = [&](int flash_err_code, const String & err_msg) {
// Note: We intentinally do not remove the snapshot from the SnapshotManager
// when this request is failed. Consider this case:
Expand All @@ -905,9 +902,11 @@ grpc::Status FlashService::EstablishDisaggTask(
try
{
auto task = std::make_shared<std::packaged_task<void()>>(
[&handler, &request, &response, deadline = grpc_context->deadline()]() {
[db_context = db_context, &task_id, &request, &response, deadline = grpc_context->deadline()]() {
auto current = std::chrono::system_clock::now();
RUNTIME_CHECK(current < deadline, current, deadline);
auto handler = std::make_unique<WNEstablishDisaggTaskHandler>(db_context, task_id);
SCOPE_EXIT({ current_memory_tracker = nullptr; });
handler->prepare(request);
handler->execute(response);
});
Expand Down