You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by li...@apache.org on 2020/04/03 09:19:41 UTC
[incubator-doris] branch branch-0.12 updated (2c8c7e7 -> d4df588)
This is an automated email from the ASF dual-hosted git repository.
lichaoyong pushed a change to branch branch-0.12
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git.
discard 2c8c7e7 Fix cast date type return wrong result (#3214)
add 3f247b0 Fix cast date type return wrong result (#3214)
add a86161f [Bug]Fix compile error (#3257)
add d2307c7 Fix be unit test error (#3259)
new d4df588 Add config: tablet writer open rpc timeout (#3258)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2c8c7e7)
\
N -- N -- N refs/heads/branch-0.12 (d4df588)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
be/src/common/config.h | 4 ++++
be/src/exec/tablet_sink.cpp | 2 +-
be/test/exec/tablet_sink_test.cpp | 2 +-
be/test/olap/column_reader_test.cpp | 2 +-
be/test/olap/schema_change_test.cpp | 2 +-
.../cn/administrator-guide/load-data/broker-load-manual.md | 2 +-
.../en/administrator-guide/load-data/broker-load-manual_EN.md | 2 +-
run-ut.sh | 6 +++---
8 files changed, 13 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[incubator-doris] 01/01: Add config: tablet writer open rpc timeout
(#3258)
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lichaoyong pushed a commit to branch branch-0.12
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit d4df588baa00b9fc16d25caf1e237f00313cef28
Author: HuangWei <hu...@xiaomi.com>
AuthorDate: Fri Apr 3 16:43:56 2020 +0800
Add config: tablet writer open rpc timeout (#3258)
---
be/src/common/config.h | 4 ++++
be/src/exec/tablet_sink.cpp | 2 +-
be/test/exec/tablet_sink_test.cpp | 2 +-
.../cn/administrator-guide/load-data/broker-load-manual.md | 2 +-
.../en/administrator-guide/load-data/broker-load-manual_EN.md | 2 +-
gensrc/script/gen_build_version.sh | 2 +-
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/be/src/common/config.h b/be/src/common/config.h
index 78fd9b3..ad7513d 100644
--- a/be/src/common/config.h
+++ b/be/src/common/config.h
@@ -284,6 +284,10 @@ namespace config {
// If the channel does not receive any data till this time,
// the channel will be removed.
CONF_Int32(streaming_load_rpc_max_alive_time_sec, "1200");
+ // the timeout of a rpc to open the tablet writer in remote BE.
+ // short operation time, can set a short timeout
+ CONF_Int32(tablet_writer_open_rpc_timeout_sec, "60");
+ // Deprecated, use query_timeout instread
// the timeout of a rpc to process one batch in tablet writer.
// you may need to increase this timeout if using larger 'streaming_load_max_mb',
// or encounter 'tablet writer write failed' error when loading.
diff --git a/be/src/exec/tablet_sink.cpp b/be/src/exec/tablet_sink.cpp
index 0cdbe64..30656e6 100644
--- a/be/src/exec/tablet_sink.cpp
+++ b/be/src/exec/tablet_sink.cpp
@@ -104,7 +104,7 @@ void NodeChannel::open() {
// This ref is for RPC's reference
_open_closure->ref();
- _open_closure->cntl.set_timeout_ms(_rpc_timeout_ms);
+ _open_closure->cntl.set_timeout_ms(config::tablet_writer_open_rpc_timeout_sec * 1000);
_stub->tablet_writer_open(&_open_closure->cntl,
&request,
&_open_closure->result,
diff --git a/be/test/exec/tablet_sink_test.cpp b/be/test/exec/tablet_sink_test.cpp
index 0760f1d..aff3653 100644
--- a/be/test/exec/tablet_sink_test.cpp
+++ b/be/test/exec/tablet_sink_test.cpp
@@ -56,7 +56,7 @@ public:
_env->_brpc_stub_cache = new BrpcStubCache();
_env->_buffer_reservation = new ReservationTracker();
- config::tablet_writer_rpc_timeout_sec = 600;
+ config::tablet_writer_open_rpc_timeout_sec = 60;
}
void TearDown() override {
delete _env->_brpc_stub_cache;
diff --git a/docs/documentation/cn/administrator-guide/load-data/broker-load-manual.md b/docs/documentation/cn/administrator-guide/load-data/broker-load-manual.md
index bc35d0c..da203cf 100644
--- a/docs/documentation/cn/administrator-guide/load-data/broker-load-manual.md
+++ b/docs/documentation/cn/administrator-guide/load-data/broker-load-manual.md
@@ -489,7 +489,7 @@ LoadFinishTime: 2019-07-27 11:50:16
* 导入报错：`failed to send batch` 或 `TabletWriter add batch with unknown id`
- 请参照 [导入手册](./load-manual.md) 中 **通用系统配置** 中 **BE 配置**，适当修改 `tablet_writer_rpc_timeout_sec` 和 `streaming_load_rpc_max_alive_time_sec`。
+ 请参照 [导入手册](./load-manual.md) 中 **通用系统配置** 中 **BE 配置**，适当修改 `query_timeout` 和 `streaming_load_rpc_max_alive_time_sec`。
* 导入报错：`LOAD_RUN_FAIL; msg:Invalid Column Name:xxx`
diff --git a/docs/documentation/en/administrator-guide/load-data/broker-load-manual_EN.md b/docs/documentation/en/administrator-guide/load-data/broker-load-manual_EN.md
index 9e3bf0a..94e4fe8 100644
--- a/docs/documentation/en/administrator-guide/load-data/broker-load-manual_EN.md
+++ b/docs/documentation/en/administrator-guide/load-data/broker-load-manual_EN.md
@@ -470,7 +470,7 @@ Cluster situation: The number of BEs in the cluster is about 3, and the Broker n
* failed with ：`failed to send batch` or `TabletWriter add batch with unknown id`
- Refer to **General System Configuration** in **BE Configuration** in the Import Manual (./load-manual.md), and modify `tablet_writer_rpc_timeout_sec` and `streaming_load_rpc_max_alive_time_sec` appropriately.
+ Refer to **General System Configuration** in **BE Configuration** in the Import Manual (./load-manual.md), and modify `query_timeout` and `streaming_load_rpc_max_alive_time_sec` appropriately.
* failed with : `LOAD_RUN_FAIL; msg: Invalid Column Name: xxx`
diff --git a/gensrc/script/gen_build_version.sh b/gensrc/script/gen_build_version.sh
index 21bb1b8..0b3550b 100755
--- a/gensrc/script/gen_build_version.sh
+++ b/gensrc/script/gen_build_version.sh
@@ -25,7 +25,7 @@
# contains the build version based on the git hash or svn revision.
##############################################################
-build_version="trunk"
+build_version="branch-0.12"
unset LANG
unset LC_CTYPE
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org