Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 23, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 2 additions & 22 deletions server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -40,7 +41,6 @@
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;
Expand Down Expand Up @@ -158,24 +158,6 @@ static void initializeProbes() {
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();

Expand Down Expand Up @@ -227,8 +209,6 @@ public void run() {
// 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));
Expand Down
2 changes: 0 additions & 2 deletions test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down