Commit ada3074
authored
[bugfix](memory) should count memory when cancel query is called (#58252)
*** Current BE git commitID: 4945aa0 ***
*** SIGABRT unknown detail explain (@0x3c54) received by PID 15444 (TID
16396 OR 0x7b2e9f39b700) from PID 15444; stack trace: ***
0# doris::signal::(anonymous namespace)::FailureSignalHandler(int,
siginfo_t*, void*) at /root/doris/be/src/common/signal_handler.h:420
1# 0x00007F3421D1D420 in /lib/x86_64-linux-gnu/libpthread.so.0
2# raise at ../sysdeps/unix/sysv/linux/raise.c:51
3# abort at /build/glibc-SzIz7B/glibc-2.31/stdlib/abort.c:81
4# 0x000055A425A57985 in
/home/work/unlimit_teamcity/TeamCity/Agents/20251120181904agent_172.16.0.6_1/work/60183217f6ee2a9c/output/be/lib/doris_be
5# 0x000055A425A4923A in
/home/work/unlimit_teamcity/TeamCity/Agents/20251120181904agent_172.16.0.6_1/work/60183217f6ee2a9c/output/be/lib/doris_be
6# google::LogMessage::SendToLog() in
/home/work/unlimit_teamcity/TeamCity/Agents/20251120181904agent_172.16.0.6_1/work/60183217f6ee2a9c/output/be/lib/doris_be
7# google::LogMessage::Flush() in
/home/work/unlimit_teamcity/TeamCity/Agents/20251120181904agent_172.16.0.6_1/work/60183217f6ee2a9c/output/be/lib/doris_be
8# google::LogMessageFatal::~LogMessageFatal() in
/home/work/unlimit_teamcity/TeamCity/Agents/20251120181904agent_172.16.0.6_1/work/60183217f6ee2a9c/output/be/lib/doris_be
9# doris::Status doris::Status::FatalError<true,
std::__cxx11::basic_string<char, std::char_traits<char>,
std::allocator<char> >&>(std::basic_string_view<char,
std::char_traits<char> >, std::__cxx11::basic_string<char,
std::char_traits<char>, std::allocator<char> >&) at
/root/doris/be/src/common/status.h:467
10# doris::io::LocalFileReader::read_at_impl(unsigned long,
doris::Slice, unsigned long*, doris::io::IOContext const*) at
/root/doris/be/src/io/fs/local_file_reader.cpp:151
11# doris::io::FileReader::read_at(unsigned long, doris::Slice, unsigned
long*, doris::io::IOContext const*) at
/root/doris/be/src/io/fs/file_reader.cpp:34
12# doris::io::S3FileSystem::upload_impl(std::filesystem::__cxx11::path
const&, std::filesystem::__cxx11::path const&) at
/root/doris/be/src/io/fs/s3_file_system.cpp:339
13# doris::io::RemoteFileSystem::upload(std::filesystem::__cxx11::path
const&, std::filesystem::__cxx11::path const&) at
/root/doris/be/src/io/fs/remote_file_system.cpp:34
14# doris::RuntimeState::get_error_log_file_path[abi:cxx11]() at
/root/doris/be/src/runtime/runtime_state.cpp:418
15#
doris::pipeline::PipelineFragmentContext::get_load_error_url[abi:cxx11]()
at /root/doris/be/src/pipeline/pipeline_fragment_context.cpp:1806
16# doris::pipeline::PipelineFragmentContext::cancel(doris::Status) at
/root/doris/be/src/pipeline/pipeline_fragment_context.cpp:202
17# doris::QueryContext::cancel_all_pipeline_context(doris::Status
const&, int) in
/home/work/unlimit_teamcity/TeamCity/Agents/20251120181904agent_172.16.0.6_1/work/60183217f6ee2a9c/output/be/lib/doris_be
18# doris::QueryContext::cancel(doris::Status, int) in
/home/work/unlimit_teamcity/TeamCity/Agents/20251120181904agent_172.16.0.6_1/work/60183217f6ee2a9c/output/be/lib/doris_be
19# doris::FragmentMgr::cancel_query(doris::TUniqueId, doris::Status) at
/root/doris/be/src/runtime/fragment_mgr.cpp:915
20# std::_Function_handler<void (),
doris::PInternalService::cancel_plan_fragment(google::protobuf::RpcController*,
doris::PCancelPlanFragmentRequest const*,
doris::PCancelPlanFragmentResult*,
google::protobuf::Closure*)::$_0>::_M_invoke(std::_Any_data const&) at
/usr/local/ldb-toolchain-v0.26/bin/../lib/gcc/x86_64-pc-linux-gnu/15/include/g++-v15/bits/std_function.h:292
21# doris::WorkThreadPool<false>::work_thread(int) in
/home/work/unlimit_teamcity/TeamCity/Agents/20251120181904agent_172.16.0.6_1/work/60183217f6ee2a9c/output/be/lib/doris_be
22# execute_native_thread_routine in
/home/work/unlimit_teamcity/TeamCity/Agents/20251120181904agent_172.16.0.6_1/work/60183217f6ee2a9c/output/be/lib/doris_be
23# asan_thread_start(void*) in
/home/work/unlimit_teamcity/TeamCity/Agents/20251120181904agent_172.16.0.6_1/work/60183217f6ee2a9c/output/be/lib/doris_be
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
apache/doris-website#1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->1 parent a5f36a1 commit ada3074
File tree
8 files changed
+15
-46
lines changed- be/src
- pipeline/exec
- runtime
8 files changed
+15
-46
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
441 | 441 | | |
442 | 442 | | |
443 | 443 | | |
444 | | - | |
| 444 | + | |
445 | 445 | | |
446 | 446 | | |
447 | 447 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
302 | 302 | | |
303 | 303 | | |
304 | 304 | | |
305 | | - | |
| 305 | + | |
306 | 306 | | |
307 | 307 | | |
308 | 308 | | |
| |||
Lines changed: 7 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
231 | 231 | | |
232 | 232 | | |
233 | 233 | | |
234 | | - | |
| 234 | + | |
235 | 235 | | |
236 | 236 | | |
237 | 237 | | |
238 | 238 | | |
239 | | - | |
| 239 | + | |
240 | 240 | | |
241 | 241 | | |
242 | 242 | | |
| |||
347 | 347 | | |
348 | 348 | | |
349 | 349 | | |
350 | | - | |
| 350 | + | |
351 | 351 | | |
352 | 352 | | |
353 | 353 | | |
354 | 354 | | |
355 | | - | |
| 355 | + | |
| 356 | + | |
356 | 357 | | |
357 | 358 | | |
358 | 359 | | |
| |||
451 | 452 | | |
452 | 453 | | |
453 | 454 | | |
454 | | - | |
| 455 | + | |
455 | 456 | | |
456 | 457 | | |
457 | 458 | | |
458 | 459 | | |
459 | | - | |
| 460 | + | |
460 | 461 | | |
461 | 462 | | |
462 | 463 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
368 | 368 | | |
369 | 369 | | |
370 | 370 | | |
371 | | - | |
| 371 | + | |
372 | 372 | | |
373 | 373 | | |
374 | 374 | | |
375 | 375 | | |
376 | | - | |
| 376 | + | |
377 | 377 | | |
378 | 378 | | |
379 | 379 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
264 | 264 | | |
265 | 265 | | |
266 | 266 | | |
267 | | - | |
| 267 | + | |
268 | 268 | | |
269 | 269 | | |
270 | 270 | | |
271 | 271 | | |
272 | | - | |
| 272 | + | |
273 | 273 | | |
274 | 274 | | |
275 | 275 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
912 | 912 | | |
913 | 913 | | |
914 | 914 | | |
| 915 | + | |
915 | 916 | | |
916 | 917 | | |
917 | 918 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | 125 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | 83 | | |
91 | 84 | | |
92 | 85 | | |
| |||
154 | 147 | | |
155 | 148 | | |
156 | 149 | | |
157 | | - | |
158 | | - | |
159 | 150 | | |
160 | 151 | | |
161 | 152 | | |
| |||
383 | 374 | | |
384 | 375 | | |
385 | 376 | | |
386 | | - | |
387 | | - | |
388 | | - | |
389 | | - | |
390 | | - | |
391 | | - | |
392 | | - | |
393 | | - | |
394 | | - | |
395 | 377 | | |
396 | 378 | | |
397 | 379 | | |
| |||
409 | 391 | | |
410 | 392 | | |
411 | 393 | | |
412 | | - | |
| 394 | + | |
413 | 395 | | |
414 | 396 | | |
415 | 397 | | |
| |||
0 commit comments