This is an automated email from the ASF dual-hosted git repository.
panxiaolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 927de33166 [config](log) disable StreamLoad log default and enable in
regression pipeline (#24354)
927de33166 is described below
commit 927de33166cfdec3f1bf63b2324ba5fcfff4e52a
Author: zclllyybb <[email protected]>
AuthorDate: Thu Sep 14 20:47:26 2023 +0800
[config](log) disable StreamLoad log default and enable in regression
pipeline (#24354)
disable StreamLoad log default and enable in regression pipeline
---
be/src/common/config.cpp | 4 ++--
be/src/http/action/stream_load.cpp | 4 ++--
docs/en/docs/admin-manual/config/be-config.md | 4 ++--
docs/zh-CN/docs/admin-manual/config/be-config.md | 4 ++--
regression-test/pipeline/external/conf/be.conf | 1 +
regression-test/pipeline/p0/conf/be.conf | 1 +
regression-test/pipeline/p1/conf/be.conf | 1 +
7 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp
index a049d48bc4..7b10bc7212 100644
--- a/be/src/common/config.cpp
+++ b/be/src/common/config.cpp
@@ -479,9 +479,9 @@ DEFINE_Int32(tablet_writer_open_rpc_timeout_sec, "60");
DEFINE_mBool(tablet_writer_ignore_eovercrowded, "true");
DEFINE_mBool(exchange_sink_ignore_eovercrowded, "true");
DEFINE_mInt32(slave_replica_writer_rpc_timeout_sec, "60");
-// Whether to enable stream load record function, the default is true.
+// Whether to enable stream load record function, the default is false.
// False: disable stream load record
-DEFINE_mBool(enable_stream_load_record, "true");
+DEFINE_mBool(enable_stream_load_record, "false");
// batch size of stream load record reported to FE
DEFINE_mInt32(stream_load_record_batch_size, "50");
// expire time of stream load record in rocksdb.
diff --git a/be/src/http/action/stream_load.cpp
b/be/src/http/action/stream_load.cpp
index dafbb8e558..e1f721ffc3 100644
--- a/be/src/http/action/stream_load.cpp
+++ b/be/src/http/action/stream_load.cpp
@@ -113,7 +113,7 @@ void StreamLoadAction::handle(HttpRequest* req) {
_exec_env->stream_load_executor()->rollback_txn(ctx.get());
ctx->need_rollback = false;
}
- if (ctx->body_sink != nullptr) {
+ if (ctx->body_sink.get() != nullptr) {
ctx->body_sink->cancel(ctx->status.to_string());
}
}
@@ -194,7 +194,7 @@ int StreamLoadAction::on_header(HttpRequest* req) {
_exec_env->stream_load_executor()->rollback_txn(ctx.get());
ctx->need_rollback = false;
}
- if (ctx->body_sink != nullptr) {
+ if (ctx->body_sink.get() != nullptr) {
ctx->body_sink->cancel(ctx->status.to_string());
}
auto str = ctx->to_json();
diff --git a/docs/en/docs/admin-manual/config/be-config.md
b/docs/en/docs/admin-manual/config/be-config.md
index 18939153ae..08c1206746 100644
--- a/docs/en/docs/admin-manual/config/be-config.md
+++ b/docs/en/docs/admin-manual/config/be-config.md
@@ -694,8 +694,8 @@ BaseCompaction:546859:
#### `enable_stream_load_record`
* Type: bool
-* Description: Whether to enable stream load record function, the default is
true.
-* Default value: true
+* Description:Whether to enable stream load record function, the default is
false.
+* Default value: false
#### `load_data_reserve_hours`
diff --git a/docs/zh-CN/docs/admin-manual/config/be-config.md
b/docs/zh-CN/docs/admin-manual/config/be-config.md
index ccb54dec9f..7501a80019 100644
--- a/docs/zh-CN/docs/admin-manual/config/be-config.md
+++ b/docs/zh-CN/docs/admin-manual/config/be-config.md
@@ -720,8 +720,8 @@ BaseCompaction:546859:
#### `enable_stream_load_record`
* 类型: bool
-* 描述: 是否开启 stream load 操作记录，默认开启
-* 默认值: true
+* 描述: 是否开启 stream load 操作记录，默认是不启用
+* 默认值: false
#### `load_data_reserve_hours`
diff --git a/regression-test/pipeline/external/conf/be.conf
b/regression-test/pipeline/external/conf/be.conf
index 730cfaba3d..9a5b3641b8 100644
--- a/regression-test/pipeline/external/conf/be.conf
+++ b/regression-test/pipeline/external/conf/be.conf
@@ -61,6 +61,7 @@ priority_networks=172.19.0.0/24
# sys_log_roll_num = 10
# sys_log_verbose_modules = *
# log_buffer_level = -1
+enable_stream_load_record = true
# palo_cgroups
disable_auto_compaction=true
diff --git a/regression-test/pipeline/p0/conf/be.conf
b/regression-test/pipeline/p0/conf/be.conf
index 3c18e12055..f022ba2dec 100644
--- a/regression-test/pipeline/p0/conf/be.conf
+++ b/regression-test/pipeline/p0/conf/be.conf
@@ -60,6 +60,7 @@ chunk_reserved_bytes_limit = 134217728
# sys_log_roll_num = 10
# sys_log_verbose_modules = *
log_buffer_level = -1
+enable_stream_load_record = true
# palo_cgroups
#storage_root_path=/mnt/hdd01/doris.SSD/NON_VEC_RELEASE;/mnt/hdd01/doris.HDD/NON_VEC_RELEASE;/mnt/hdd02/doris.SSD/NON_VEC_RELEASE;/mnt/hdd02/doris.HDD/NON_VEC_RELEASE;/mnt/hdd03/doris.SSD/NON_VEC_RELEASE;/mnt/hdd03/doris.HDD/NON_VEC_RELEASE;/mnt/hdd04/doris.SSD/NON_VEC_RELEASE;/mnt/hdd04/doris.HDD/NON_VEC_RELEASE;/mnt/hdd05/doris.SSD/NON_VEC_RELEASE;/mnt/hdd05/doris.HDD/NON_VEC_RELEASE;/mnt/hdd06/doris.SSD/NON_VEC_RELEASE;/mnt/hdd06/doris.HDD/NON_VEC_RELEASE;
diff --git a/regression-test/pipeline/p1/conf/be.conf
b/regression-test/pipeline/p1/conf/be.conf
index d144948dbe..d4b1cec2e8 100644
--- a/regression-test/pipeline/p1/conf/be.conf
+++ b/regression-test/pipeline/p1/conf/be.conf
@@ -61,6 +61,7 @@ priority_networks=172.19.0.0/24
# sys_log_roll_num = 10
# sys_log_verbose_modules = *
# log_buffer_level = -1
+enable_stream_load_record = true
# palo_cgroups
disable_auto_compaction=true
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
