This is an automated email from the ASF dual-hosted git repository.

adonisling 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 8c4f3d4126 [chore](macOS) Fix JAVA_OPTS in start_be.sh (#19267)
8c4f3d4126 is described below

commit 8c4f3d41262362b295def347c042ac6edbe6a0aa
Author: Adonis Ling <adonis0...@gmail.com>
AuthorDate: Mon May 8 14:01:10 2023 +0800

    [chore](macOS) Fix JAVA_OPTS in start_be.sh (#19267)
    
    We should set -XX:-MaxFDLimit on macOS if we enable java support for BE 
otherwise BE may fail to start up.
---
 bin/start_be.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bin/start_be.sh b/bin/start_be.sh
index 9fee3c34f9..46a0e58388 100755
--- a/bin/start_be.sh
+++ b/bin/start_be.sh
@@ -287,7 +287,15 @@ else
 fi
 
 if [[ "${MACHINE_OS}" == "Darwin" ]]; then
-    final_java_opt="${final_java_opt} -XX:-MaxFDLimit"
+    max_fd_limit='-XX:-MaxFDLimit'
+
+    if ! echo "${final_java_opt}" | grep "${max_fd_limit/-/\-}" >/dev/null; 
then
+        final_java_opt="${final_java_opt} ${max_fd_limit}"
+    fi
+
+    if [[ -n "${JAVA_OPTS}" ]] && ! echo "${JAVA_OPTS}" | grep 
"${max_fd_limit/-/\-}" >/dev/null; then
+        JAVA_OPTS="${JAVA_OPTS} ${max_fd_limit}"
+    fi
 fi
 
 # set LIBHDFS_OPTS for hadoop libhdfs


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to