GG-36475 Fix the illegal reflective access warnings issue #3070
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,164 +1,97 @@ | ||
| #!/usr/bin/env bash | ||
| if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]; then | ||
| set -o nounset | ||
| set -o errexit | ||
| set -o pipefail | ||
| set -o errtrace | ||
| set -o functrace | ||
| fi | ||
|
|
||
| # Copyright 2019 GridGain Systems, Inc. and Contributors. | ||
| # Licensed under the GridGain Community Edition License (the "License"); | ||
| # You may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # Grid cluster control. | ||
|
|
||
| # Import common functions. | ||
| if [ "${IGNITE_HOME:-}" = "" ]; then | ||
| IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; pwd)")" | ||
| else | ||
| IGNITE_HOME_TMP=${IGNITE_HOME} | ||
| fi | ||
|
|
||
| # Set SCRIPTS_HOME - base path to scripts. | ||
| SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin" | ||
| . "${SCRIPTS_HOME}/include/functions.sh" | ||
| . "${SCRIPTS_HOME}/include/jvmdefaults.sh" || exit 1 | ||
|
There was a problem hiding this comment. Could you please clarify why we need |
||
|
|
||
| # Discover path to Java executable and check its version. | ||
| checkJava | ||
|
|
||
| # Determine Java version function | ||
| determineJavaVersion() { | ||
| local version_output=$(java -version 2>&1) | ||
| local version=$(echo "$version_output" | awk -F '"' '/version/ {print $2}' | awk -F '.' '{if ($1 == 1) {print $2} else {print $1}}') | ||
| echo $version | ||
| } | ||
| JAVA_VERSION=$(determineJavaVersion) # Ensure this function is implemented correctly to fetch Java version | ||
|
|
||
| # Discover IGNITE_HOME environment variable. | ||
| setIgniteHome | ||
|
|
||
| if [ "${DEFAULT_CONFIG:-}" == "" ]; then | ||
| DEFAULT_CONFIG=config/default-config.xml | ||
| fi | ||
|
|
||
| # Set IGNITE_LIBS. | ||
| . "${SCRIPTS_HOME}/include/setenv.sh" | ||
| CP="${IGNITE_LIBS}:${IGNITE_HOME}/libs/optional/ignite-zookeeper/*" | ||
| RANDOM_NUMBER=$("$JAVA" -cp "${CP}" org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator) | ||
|
|
||
| # Mac OS specific support to display correct name in the dock. | ||
| osname=$(uname) | ||
| if [ "${DOCK_OPTS:-}" == "" ]; then | ||
| DOCK_OPTS="-Xdock:name=Ignite Node" | ||
| fi | ||
|
|
||
|
|
||
|
There was a problem hiding this comment. I think, there is no need to remove this commented option(s) from the script. It might be useful. If the user wants to use the option, it is only required to uncomment just one line. At least the following options seem useful to me: |
||
|
|
||
| # Set JVM options with dynamic version check | ||
| CONTROL_JVM_OPTS=$(getJavaSpecificOpts $JAVA_VERSION "$CONTROL_JVM_OPTS") | ||
| CONTROL_JVM_OPTS+=" --illegal-access=warn" | ||
| CONTROL_JVM_OPTS+=" --add-opens=java.base/java.nio=ALL-UNNAMED" | ||
|
There was a problem hiding this comment. Does this mean that |
||
| CONTROL_JVM_OPTS+=" --add-opens=java.base/sun.nio.ch=ALL-UNNAMED" | ||
|
|
||
| # Enable assertions if set. | ||
| if [ "${ENABLE_ASSERTIONS:-}" = "1" ]; then | ||
| # CONTROL_JVM_OPTS="${CONTROL_JVM_OPTS} -ea" | ||
| CONTROL_JVM_OPTS+=" -ea" | ||
| fi | ||
|
|
||
| # Set main class to start service (grid node by default). | ||
| if [ "${MAIN_CLASS:-}" = "" ]; then | ||
| MAIN_CLASS=org.apache.ignite.internal.commandline.CommandHandler | ||
| fi | ||
|
|
||
| # Execute Java command based on OS | ||
| case $osname in | ||
| Darwin*) | ||
| "$JAVA" ${CONTROL_JVM_OPTS} ${QUIET:-} "${DOCK_OPTS}" -DIGNITE_HOME="${IGNITE_HOME}" \ | ||
| -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS:-} -cp "${CP}" ${MAIN_CLASS} "$@" | ||
| ;; | ||
| OS/390*) | ||
| "$JAVA" ${CONTROL_JVM_OPTS} ${QUIET:-} -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="${IGNITE_HOME}" \ | ||
| $(getIbmSslOpts $JAVA_VERSION) -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS:-} -cp "${CP}" ${MAIN_CLASS} "$@" | ||
| ;; | ||
| *) | ||
| "$JAVA" ${CONTROL_JVM_OPTS} ${QUIET:-} -DIGNITE_HOME="${IGNITE_HOME}" \ | ||
| -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS:-} -cp "${CP}" ${MAIN_CLASS} "$@" | ||
| ;; | ||
| esac | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure about this change. This is our standard license that is used everywhere. Anyway, it is up to you. The license check looks OK https://ggtc.gridgain.com/buildConfiguration/GridGain8_Test_SanityCheck_Licenses?branch=gg-36475&buildTypeTab=overview&mode=builds#all-projects