Forráskód Böngészése

Remove xshare shell logic (#85764)

When adding aarch64 support to Elasticsearch, a bug existed in the jdk
which caused an error message to be printed on every invocation of Java
due to page size misalignment (see
https://bugs.openjdk.java.net/browse/JDK-8236847). This bug was fixed in
Java 17. Since the main branch always uses Java 17, the workaround is no
longer necessary.

relates #85758
Ryan Ernst 3 éve
szülő
commit
c935f694da

+ 2 - 4
distribution/src/bin/elasticsearch

@@ -44,7 +44,7 @@ while [ $# -gt 0 ]; do
 done
 
 if [ -z "$ES_TMPDIR" ]; then
-  ES_TMPDIR=`"$JAVA" "$XSHARE" -cp "$LAUNCHERS_CLASSPATH" org.elasticsearch.tools.launchers.TempDirectory`
+  ES_TMPDIR=`"$JAVA" -cp "$LAUNCHERS_CLASSPATH" org.elasticsearch.tools.launchers.TempDirectory`
 fi
 
 if [ -z "$LIBFFI_TMPDIR" ]; then
@@ -98,7 +98,7 @@ fi
 #   - second, JVM options are read from jvm.options and jvm.options.d/*.options
 #   - third, JVM options from ES_JAVA_OPTS are applied
 #   - fourth, ergonomic JVM options are applied
-ES_JAVA_OPTS=`export ES_TMPDIR; "$JAVA" "$XSHARE" -cp "$LAUNCHERS_CLASSPATH" org.elasticsearch.tools.launchers.JvmOptionsParser "$ES_PATH_CONF" "$ES_HOME/plugins"`
+ES_JAVA_OPTS=`export ES_TMPDIR; "$JAVA" -cp "$LAUNCHERS_CLASSPATH" org.elasticsearch.tools.launchers.JvmOptionsParser "$ES_PATH_CONF" "$ES_HOME/plugins"`
 
 # Remove enrollment related parameters before passing the arg list to Elasticsearch
 for i in "${!ARG_LIST[@]}"; do
@@ -111,7 +111,6 @@ done
 if [[ $DAEMONIZE = false ]]; then
   exec \
     "$JAVA" \
-    "$XSHARE" \
     $ES_JAVA_OPTS \
     -Des.path.home="$ES_HOME" \
     -Des.path.conf="$ES_PATH_CONF" \
@@ -124,7 +123,6 @@ if [[ $DAEMONIZE = false ]]; then
 else
   exec \
     "$JAVA" \
-    "$XSHARE" \
     $ES_JAVA_OPTS \
     -Des.path.home="$ES_HOME" \
     -Des.path.conf="$ES_PATH_CONF" \

+ 0 - 1
distribution/src/bin/elasticsearch-cli

@@ -22,7 +22,6 @@ ES_JAVA_OPTS="-Xms4m -Xmx64m -XX:+UseSerialGC ${ES_JAVA_OPTS}"
 
 exec \
   "$JAVA" \
-  "$XSHARE" \
   $ES_JAVA_OPTS \
   -Des.path.home="$ES_HOME" \
   -Des.path.conf="$ES_PATH_CONF" \

+ 0 - 6
distribution/src/bin/elasticsearch-env

@@ -77,12 +77,6 @@ if [ ! -z "$JAVA_OPTS" ]; then
   echo "pass JVM parameters via ES_JAVA_OPTS"
 fi
 
-if [[ "$("$JAVA" -version 2>/dev/null)" =~ "Unable to map CDS archive" ]]; then
-  XSHARE="-Xshare:off"
-else
-  XSHARE="-Xshare:auto"
-fi
-
 export HOSTNAME=$HOSTNAME
 
 @source.path.env@

+ 0 - 1
distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/JvmOption.java

@@ -95,7 +95,6 @@ class JvmOption {
         final List<String> command = Stream.of(
             Stream.of(java),
             userDefinedJvmOptions.stream(),
-            Stream.of("-Xshare:off"),
             Stream.of("-XX:+PrintFlagsFinal"),
             Stream.of("-version")
         ).reduce(Stream::concat).get().toList();

+ 0 - 1
x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli

@@ -15,6 +15,5 @@ CLI_JAR=$(ls "$ES_HOME"/bin/elasticsearch-sql-cli-*.jar)
 
 exec \
   "$JAVA" \
-  "$XSHARE" \
   -jar "$CLI_JAR" \
   $CLI_PARAMETERS