Skip to content

[branch-2.1](log) Pick all BE execution log reduction #43267

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
yiguolei merged 2 commits into from
Nov 12, 2024
Merged

[branch-2.1](log) Pick all BE execution log reduction #43267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
605f5be
[Enhancement](log) Make query relative BE log more reasonable (#42900)
zclllyybb Nov 5, 2024
4eda048
[chore](log) Reduce some BE execution log (#42383)
zclllyybb Oct 28, 2024
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
2 changes: 1 addition & 1 deletion be/src/common/status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ class [[nodiscard]] Status {
ERROR_CTOR_NOSTACK(Cancelled, CANCELLED)
ERROR_CTOR(MemoryLimitExceeded, MEM_LIMIT_EXCEEDED)
ERROR_CTOR(RpcError, THRIFT_RPC_ERROR)
ERROR_CTOR(TimedOut, TIMEOUT)
ERROR_CTOR_NOSTACK(TimedOut, TIMEOUT)
ERROR_CTOR_NOSTACK(TooManyTasks, TOO_MANY_TASKS)
ERROR_CTOR(Uninitialized, UNINITIALIZED)
ERROR_CTOR(Aborted, ABORTED)
Expand Down
9 changes: 5 additions & 4 deletions be/src/pipeline/exec/result_sink_operator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

#include "result_sink_operator.h"

#include <fmt/format.h>
#include <sys/select.h>

#include <memory>

#include "common/config.h"
#include "common/object_pool.h"
#include "exec/rowid_fetcher.h"
#include "pipeline/exec/operator.h"
#include "runtime/buffer_control_block.h"
Expand Down Expand Up @@ -202,9 +202,10 @@ Status ResultSinkLocalState::close(RuntimeState* state, Status exec_status) {
final_status = st;
}

LOG_INFO("Query {} result sink closed with status {} and has written {} rows",
print_id(state->query_id()), final_status.to_string_no_stack(),
_writer->get_written_rows());
VLOG_NOTICE << fmt::format(
"Query {} result sink closed with status {} and has written {} rows",
print_id(state->query_id()), final_status.to_string_no_stack(),
_writer->get_written_rows());
}

// close sender, this is normal path end
Expand Down
3 changes: 0 additions & 3 deletions be/src/pipeline/pipeline_fragment_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,6 @@ Status PipelineFragmentContext::prepare(const doris::TPipelineFragmentParams& re

auto* fragment_context = this;

LOG_INFO("Preparing instance {}|{}, backend_num {}", print_id(_query_id),
print_id(local_params.fragment_instance_id), local_params.backend_num);

// 1. init _runtime_state
_runtime_state = RuntimeState::create_unique(
local_params.fragment_instance_id, request.query_id, request.fragment_id,
Expand Down
8 changes: 5 additions & 3 deletions be/src/runtime/fragment_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,12 +698,13 @@ Status FragmentMgr::exec_plan_fragment(const TPipelineFragmentParams& params,
}

Status FragmentMgr::start_query_execution(const PExecPlanFragmentStartRequest* request) {
TUniqueId query_id;
query_id.__set_hi(request->query_id().hi());
query_id.__set_lo(request->query_id().lo());
std::shared_ptr<QueryContext> q_ctx = nullptr;
{
std::lock_guard<std::mutex> lock(_lock);
TUniqueId query_id;
query_id.__set_hi(request->query_id().hi());
query_id.__set_lo(request->query_id().lo());

auto search = _query_ctx_map.find(query_id);
if (search == _query_ctx_map.end()) {
return Status::InternalError(
Expand All @@ -714,6 +715,7 @@ Status FragmentMgr::start_query_execution(const PExecPlanFragmentStartRequest* r
q_ctx = search->second;
}
q_ctx->set_ready_to_execute(false);
LOG_INFO("Query {} start execution", print_id(query_id));
return Status::OK();
}

Expand Down
4 changes: 3 additions & 1 deletion be/src/runtime/query_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <exception>
#include <memory>

#include "common/logging.h"
#include "pipeline/pipeline_fragment_context.h"
#include "pipeline/pipeline_x/dependency.h"
#include "runtime/runtime_query_statistics_mgr.h"
Expand Down Expand Up @@ -185,7 +186,8 @@ QueryContext::~QueryContext() {

_exec_env->spill_stream_mgr()->async_cleanup_query(_query_id);
DorisMetrics::instance()->query_ctx_cnt->increment(-1);
LOG_INFO("Query {} deconstructed, {}", print_id(this->_query_id), mem_tracker_msg);
// the only one msg shows query's end. any other msg should append to it if need.
LOG_INFO("Query {} deconstructed, mem_tracker: {}", print_id(this->_query_id), mem_tracker_msg);
}

void QueryContext::set_ready_to_execute(bool is_cancelled) {
Expand Down