From de0fd8cc44275ff78bb3d9228be0d94db57b79d4 Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Tue, 4 Jul 2023 21:37:19 +0800
Subject: [PATCH] [CELEBORN-762] Always set JVM opts
 -XX:+IgnoreUnrecognizedVMOptions

### What changes were proposed in this pull request?

Always set JVM opts `-XX:+IgnoreUnrecognizedVMOptions`

### Why are the changes needed?

By default, JVM failed to start when unknown opts are set, it's not friendly for users who want to use different versions of JDK.

### Does this PR introduce _any_ user-facing change?

Yes, users can success start celeborn even if they provide unknown JVM opts.

### How was this patch tested?

Review.

Closes #1676 from pan3793/CELEBORN-762.

Authored-by: Cheng Pan <chengpan@apache.org>
Signed-off-by: Cheng Pan <chengpan@apache.org>
---
 bin/celeborn-class     | 2 +-
 bin/celeborn-ratis     | 2 +-
 sbin/restart-worker.sh | 1 -
 sbin/start-worker.sh   | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/celeborn-class b/bin/celeborn-class
index f98d196d573..5bb3791ff1a 100755
--- a/bin/celeborn-class
+++ b/bin/celeborn-class
@@ -76,7 +76,7 @@ fi
 set +o posix
 CMD=()
 CMD+=("$JAVA")
-CMD=(${CMD[@]} "$CELEBORN_JAVA_OPTS")
+CMD=(${CMD[@]} "-XX:+IgnoreUnrecognizedVMOptions" "$CELEBORN_JAVA_OPTS")
 CMD+=("-cp")
 CMD+=("$CELEBORN_CLASSPATH")
 CMD=(${CMD[@]} "$@")
diff --git a/bin/celeborn-ratis b/bin/celeborn-ratis
index 77ead6ad56f..b272ae6a597 100755
--- a/bin/celeborn-ratis
+++ b/bin/celeborn-ratis
@@ -36,7 +36,7 @@ function runJavaClass {
               CLASS_ARGS+=("${arg}")
       esac
   done
-  "${JAVA}" -cp "${CLASSPATH}" ${CELEBORN_RATIS_SHELL_JAVA_OPTS} "${CLASS}" ${PARAMETER} "${CLASS_ARGS[@]}"
+  "${JAVA}" -cp "${CLASSPATH}" -XX:+IgnoreUnrecognizedVMOptions ${CELEBORN_RATIS_SHELL_JAVA_OPTS} "${CLASS}" ${PARAMETER} "${CLASS_ARGS[@]}"
 }
 
 function main {
diff --git a/sbin/restart-worker.sh b/sbin/restart-worker.sh
index 296088c7156..9f0a2a35617 100755
--- a/sbin/restart-worker.sh
+++ b/sbin/restart-worker.sh
@@ -35,7 +35,6 @@ fi
 CELEBORN_JAVA_OPTS="$CELEBORN_WORKER_JAVA_OPTS"
 CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS -Xmx$CELEBORN_WORKER_MEMORY"
 CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS -XX:MaxDirectMemorySize=$CELEBORN_WORKER_OFFHEAP_MEMORY"
-CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS -XX:+IgnoreUnrecognizedVMOptions"
 CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS -Dio.netty.tryReflectionSetAccessible=true"
 CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"
 CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS --illegal-access=warn"
diff --git a/sbin/start-worker.sh b/sbin/start-worker.sh
index e812237244e..0c27e0e8b6f 100755
--- a/sbin/start-worker.sh
+++ b/sbin/start-worker.sh
@@ -35,7 +35,6 @@ fi
 CELEBORN_JAVA_OPTS="$CELEBORN_WORKER_JAVA_OPTS"
 CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS -Xmx$CELEBORN_WORKER_MEMORY"
 CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS -XX:MaxDirectMemorySize=$CELEBORN_WORKER_OFFHEAP_MEMORY"
-CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS -XX:+IgnoreUnrecognizedVMOptions"
 CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS -Dio.netty.tryReflectionSetAccessible=true"
 CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"
 CELEBORN_JAVA_OPTS="$CELEBORN_JAVA_OPTS --illegal-access=warn"