This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.0-alpha
in repository https://gitbox.apache.org/repos/asf/doris.git
commit d4454eeaa2d9819a4cd95369a4254510889dd62b
Author: Pxl <pxl...@qq.com>
AuthorDate: Thu Apr 20 10:03:40 2023 +0800
[Chore](build) ignore compile warning on orc && fix invalid command curdate
on conf (#18810)
ignore compile warning on orc && fix invalid command curdate on conf
---
be/CMakeLists.txt | 2 +-
conf/be.conf | 3 ++-
conf/fe.conf | 7 ++++---
regression-test/pipeline/p0/conf/be.conf | 2 +-
regression-test/pipeline/p1/conf/be.conf | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index d54498e78c..3b767b410b 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -447,7 +447,7 @@ SET(ZSTD_HOME "$ENV{DORIS_THIRDPARTY}/installed")
SET(ZSTD_INCLUDE_DIR "$ENV{DORIS_THIRDPARTY}/installed/include/zstd")
add_subdirectory(${SRC_DIR}/apache-orc EXCLUDE_FROM_ALL)
-target_compile_options(orc PRIVATE -Wno-implicit-fallthrough)
+target_compile_options(orc PRIVATE -Wno-implicit-fallthrough -w)
# Check if functions are supported in this platform. All flags will generated
# in gensrc/build/common/env_config.h.
diff --git a/conf/be.conf b/conf/be.conf
index 3a3ec1e7de..1961ab3592 100644
--- a/conf/be.conf
+++ b/conf/be.conf
@@ -15,9 +15,10 @@
# specific language governing permissions and limitations
# under the License.
+CUR_DATE='$(date +%Y%m%d-%H%M%S)'
+
PPROF_TMPDIR="$DORIS_HOME/log/"
-CUR_DATE = `date +%Y%m%d-%H%M%S`
JAVA_OPTS="-Xmx1024m -DlogPath=$DORIS_HOME/log/jni.log
-Xlog:gc:$DORIS_HOME/log/be.gc.log.$CUR_DATE -Dsun.java.command=DorisBE
-XX:-CriticalJNINatives -DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100
-DJDBC_MAX_IDEL_TIME=600000"
# since 1.2, the JAVA_HOME need to be set to run BE process.
diff --git a/conf/fe.conf b/conf/fe.conf
index 4a52b6ee06..849d387bdd 100644
--- a/conf/fe.conf
+++ b/conf/fe.conf
@@ -21,14 +21,15 @@
## see fe/src/org/apache/doris/common/Config.java
#####################################################################
+CUR_DATE='$(date +%Y%m%d-%H%M%S)'
+
# the output dir of stderr and stdout
LOG_DIR = ${DORIS_HOME}/log
-DATE = `date +%Y%m%d-%H%M%S`
-JAVA_OPTS="-Xmx8192m -XX:+UseMembar -XX:SurvivorRatio=8
-XX:MaxTenuringThreshold=7 -XX:+PrintGCDateStamps -XX:+PrintGCDetails
-XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled
-XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80
-XX:SoftRefLRUPolicyMSPerMB=0 -Xloggc:$DORIS_HOME/log/fe.gc.log.$DATE"
+JAVA_OPTS="-Xmx8192m -XX:+UseMembar -XX:SurvivorRatio=8
-XX:MaxTenuringThreshold=7 -XX:+PrintGCDateStamps -XX:+PrintGCDetails
-XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled
-XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80
-XX:SoftRefLRUPolicyMSPerMB=0 -Xloggc:$DORIS_HOME/log/fe.gc.log.$CUR_DATE"
# For jdk 9+, this JAVA_OPTS will be used as default JVM options
-JAVA_OPTS_FOR_JDK_9="-Xmx8192m -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7
-XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled
-XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0
-Xlog:gc*:$DORIS_HOME/log/fe.gc.log.$DATE:time"
+JAVA_OPTS_FOR_JDK_9="-Xmx8192m -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7
-XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled
-XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0
-Xlog:gc*:$DORIS_HOME/log/fe.gc.log.$CUR_DATE:time"
##
## the lowercase properties are read by main program.
diff --git a/regression-test/pipeline/p0/conf/be.conf
b/regression-test/pipeline/p0/conf/be.conf
index a4db97eb77..1b0d8fed61 100644
--- a/regression-test/pipeline/p0/conf/be.conf
+++ b/regression-test/pipeline/p0/conf/be.conf
@@ -26,7 +26,7 @@ webserver_port = 8141
heartbeat_service_port = 9151
brpc_port = 8161
-mem_limit = 30%
+mem_limit = 33%
disable_minidump = true
path_gc_check_interval_second=1
max_garbage_sweep_interval=180
diff --git a/regression-test/pipeline/p1/conf/be.conf
b/regression-test/pipeline/p1/conf/be.conf
index aa6ff8d54c..148c214dfb 100644
--- a/regression-test/pipeline/p1/conf/be.conf
+++ b/regression-test/pipeline/p1/conf/be.conf
@@ -26,7 +26,7 @@ webserver_port = 8142
heartbeat_service_port = 9152
brpc_port = 8162
-mem_limit = 30%
+mem_limit = 33%
disable_minidump = true
path_gc_check_interval_second=1
max_garbage_sweep_interval=180
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
