honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Workaround for JDK 14 EA FileChannel.map issue (#50523)" (#51323) 

This reverts commit c7fd24ca1569a809b499caf34077599e463bb8d6.

Now that JDK-8236582 is fixed in JDK 14 EA, we can revert the workaround.

Relates #50523 and #50512
This commit is contained in:
Henning Andersen 2020-01-23 11:25:19 +01:00 committed by Henning Andersen
parent 157b352b47
commit 8c8d0dbacc
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View File

@ -19,13 +19,14 @@
package org.elasticsearch.bootstrap;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.config.Configurator;
import org.apache.lucene.util.Constants;
import org.elasticsearch.core.internal.io.IOUtils;
import org.apache.lucene.util.StringHelper;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.Version;
@ -41,7 +42,6 @@ import org.elasticsearch.common.settings.KeyStoreWrapper;
import org.elasticsearch.common.settings.SecureSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.BoundTransportAddress;
import org.elasticsearch.core.internal.io.IOUtils;
import org.elasticsearch.env.Environment;
import org.elasticsearch.monitor.jvm.JvmInfo;
import org.elasticsearch.monitor.os.OsProbe;
@ -160,24 +160,6 @@ final class Bootstrap {
JvmInfo.jvmInfo();
}
/**
* JDK 14 bug:
* https://github.com/elastic/elasticsearch/issues/50512
* We circumvent it here by loading the offending class before installing security manager.
*
* To be removed once the JDK is fixed.
*/
static void fixJDK14EAFileChannelMap() {
// minor time-bomb here to ensure that we reevaluate if final 14 version does not include fix.
if (System.getProperty("java.version").equals("14-ea")) {
try {
Class.forName("jdk.internal.misc.ExtendedMapMode", true, Bootstrap.class.getClassLoader());
} catch (ClassNotFoundException e) {
throw new RuntimeException("Unable to lookup ExtendedMapMode class", e);
}
}
}
private void setup(boolean addShutdownHook, Environment environment) throws BootstrapException {
Settings settings = environment.settings();
@ -229,8 +211,6 @@ final class Bootstrap {
// Log ifconfig output before SecurityManager is installed
IfConfig.logIfNecessary();
fixJDK14EAFileChannelMap();
// install SM after natives, shutdown hooks, etc.
try {
Security.configure(environment, BootstrapSettings.SECURITY_FILTER_BAD_DEFAULTS_SETTING.get(settings));

2
test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java
View File

@ -102,8 +102,6 @@ public class BootstrapForTesting {
// Log ifconfig output before SecurityManager is installed
IfConfig.logIfNecessary();
Bootstrap.fixJDK14EAFileChannelMap();
// install security manager if requested
if (systemPropertyAsBoolean("tests.security.manager", true)) {
try {