You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2021/11/08 13:58:26 UTC
[incubator-doris] 08/11: [refactor] set `forward_to_master` true by
default (#7017)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-0.15
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit 0a551e4dd039879c7089f07284900254170ce495
Author: Zhengguo Yang <ya...@gmail.com>
AuthorDate: Sat Nov 6 13:27:26 2021 +0800
[refactor] set `forward_to_master` true by default (#7017)
* ot set forward_to_master true by default
* Update docs/zh-CN/administrator-guide/variables.md
---
be/src/runtime/stream_load/stream_load_executor.cpp | 5 +++--
docs/en/administrator-guide/variables.md | 2 +-
docs/zh-CN/administrator-guide/variables.md | 2 +-
.../main/java/org/apache/doris/analysis/ShowRoutineLoadTaskStmt.java | 5 +++++
.../java/org/apache/doris/load/routineload/RoutineLoadManager.java | 4 +++-
fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java | 2 +-
6 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/be/src/runtime/stream_load/stream_load_executor.cpp b/be/src/runtime/stream_load/stream_load_executor.cpp
index 87d8de4..c76f356 100644
--- a/be/src/runtime/stream_load/stream_load_executor.cpp
+++ b/be/src/runtime/stream_load/stream_load_executor.cpp
@@ -45,7 +45,8 @@ Status StreamLoadExecutor::execute_plan_fragment(StreamLoadContext* ctx) {
return execute_plan_fragment(ctx, nullptr);
}
-Status StreamLoadExecutor::execute_plan_fragment(StreamLoadContext* ctx, std::shared_ptr<StreamLoadPipe> pipe) {
+Status StreamLoadExecutor::execute_plan_fragment(StreamLoadContext* ctx,
+ std::shared_ptr<StreamLoadPipe> pipe) {
DorisMetrics::instance()->txn_exec_plan_total->increment(1);
// submit this params
#ifndef BE_TEST
@@ -217,7 +218,7 @@ Status StreamLoadExecutor::commit_txn(StreamLoadContext* ctx) {
// rollback this transaction
Status status(result.status);
if (!status.ok()) {
- LOG(WARNING) << "commit transaction failed, errmsg=" << status.get_error_msg()
+ LOG(WARNING) << "commit transaction failed, errmsg=" << status.get_error_msg() << ", "
<< ctx->brief();
if (status.code() == TStatusCode::PUBLISH_TIMEOUT) {
ctx->need_rollback = false;
diff --git a/docs/en/administrator-guide/variables.md b/docs/en/administrator-guide/variables.md
index 815ceef..b57be76 100644
--- a/docs/en/administrator-guide/variables.md
+++ b/docs/en/administrator-guide/variables.md
@@ -195,7 +195,7 @@ Note that the comment must start with /*+ and can only follow the SELECT.
* `forward_to_master`
- The user sets whether to forward some commands to the Master FE node for execution. The default is false, which means no forwarding. There are multiple FE nodes in Doris, one of which is the Master node. Usually users can connect to any FE node for full-featured operation. However, some of detail information can only be obtained from the Master FE node.
+ The user sets whether to forward some commands to the Master FE node for execution. The default is `true`, which means no forwarding. There are multiple FE nodes in Doris, one of which is the Master node. Usually users can connect to any FE node for full-featured operation. However, some of detail information can only be obtained from the Master FE node.
For example, the `SHOW BACKENDS;` command, if not forwarded to the Master FE node, can only see some basic information such as whether the node is alive, and forwarded to the Master FE to obtain more detailed information including the node startup time and the last heartbeat time.
diff --git a/docs/zh-CN/administrator-guide/variables.md b/docs/zh-CN/administrator-guide/variables.md
index 72b6fb7..5c54440 100644
--- a/docs/zh-CN/administrator-guide/variables.md
+++ b/docs/zh-CN/administrator-guide/variables.md
@@ -192,7 +192,7 @@ SELECT /*+ SET_VAR(query_timeout = 1, enable_partition_cache=true) */ sleep(3);
* `forward_to_master`
- 用户设置是否将一些命令转发到 Master FE 节点执行。默认为 false，即不转发。Doris 中存在多个 FE 节点，其中一个为 Master 节点。通常用户可以连接任意 FE 节点进行全功能操作。但部分信息查看指令，只有从 Master FE 节点才能获取详细信息。
+ 用户设置是否将一些show 类命令转发到 Master FE 节点执行。默认为 `true`，即转发。Doris 中存在多个 FE 节点，其中一个为 Master 节点。通常用户可以连接任意 FE 节点进行全功能操作。但部分信息查看指令，只有从 Master FE 节点才能获取详细信息。
如 `SHOW BACKENDS;` 命令，如果不转发到 Master FE 节点，则仅能看到节点是否存活等一些基本信息，而转发到 Master FE 则可以获取包括节点启动时间、最后一次心跳时间等更详细的信息。
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRoutineLoadTaskStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRoutineLoadTaskStmt.java
index d280704..6a7dccc 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRoutineLoadTaskStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRoutineLoadTaskStmt.java
@@ -145,4 +145,9 @@ public class ShowRoutineLoadTaskStmt extends ShowStmt {
public static List<String> getTitleNames() {
return TITLE_NAMES;
}
+
+ @Override
+ public RedirectStatus getRedirectStatus() {
+ return RedirectStatus.FORWARD_NO_SYNC;
+ }
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java
index 4d283e5..dc0806c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java
@@ -426,7 +426,9 @@ public class RoutineLoadManager implements Writable {
// 1. Find if the given BE id has available slots
if (previoudBeId != -1L) {
int idleTaskNum = 0;
- if (beIdToConcurrentTasks.containsKey(previoudBeId)) {
+ if (beIdToMaxConcurrentTasks.containsKey(previoudBeId)) {
+ idleTaskNum = 0;
+ } else if (beIdToConcurrentTasks.containsKey(previoudBeId)) {
idleTaskNum = beIdToMaxConcurrentTasks.get(previoudBeId) - beIdToConcurrentTasks.get(previoudBeId);
} else {
idleTaskNum = Config.max_routine_load_task_num_per_be;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index 859508b..d536f62 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -312,7 +312,7 @@ public class SessionVariable implements Serializable, Writable {
private boolean enableJoinReorderBasedCost = false;
@VariableMgr.VarAttr(name = FORWARD_TO_MASTER)
- public boolean forwardToMaster = false;
+ public boolean forwardToMaster = true;
@VariableMgr.VarAttr(name = LOAD_MEM_LIMIT)
public long loadMemLimit = 0L;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org