You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/02/05 11:38:57 UTC
[ignite] 05/06: IGNITE-11104 Remove references to Java <8,
Apache Ignite <2 - Fixes #5983.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-11191
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 08797585545ab46d94237d181c3b3e2e2d9b618e
Author: Ilya Kasnacheev <il...@gmail.com>
AuthorDate: Tue Feb 5 14:28:24 2019 +0300
IGNITE-11104 Remove references to Java <8, Apache Ignite <2 - Fixes #5983.
Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
---
.../org/apache/ignite/IgniteSystemProperties.java | 6 ---
.../org/apache/ignite/internal/IgnitionEx.java | 50 ----------------------
.../managers/discovery/GridDiscoveryManager.java | 18 +-------
.../processors/security/SecurityUtils.java | 4 --
.../processors/service/GridServiceProxy.java | 7 +--
5 files changed, 2 insertions(+), 83 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index b9413e2..cd5f496 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -722,12 +722,6 @@ public final class IgniteSystemProperties {
public static final String IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL = "IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL";
/**
- * Start Ignite on versions of JRE 7 older than 1.7.0_71. For proper work it may require
- * disabling JIT in some places.
- */
- public static final String IGNITE_FORCE_START_JAVA7 = "IGNITE_FORCE_START_JAVA7";
-
- /**
* When set to {@code true}, Ignite switches to compatibility mode with versions that don't
* support service security permissions. In this case security permissions will be ignored
* (if they set).
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 7643488..4aae4d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -134,7 +134,6 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_CLIENT;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONFIG_URL;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_CONSISTENT_ID;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_DEP_MODE_OVERRIDE;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_FORCE_START_JAVA7;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOCAL_HOST;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_SHUTDOWN_HOOK;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_RESTART_CODE;
@@ -201,55 +200,6 @@ public class IgnitionEx {
/** */
private static ThreadLocal<Boolean> clientMode = new ThreadLocal<>();
- /*
- * Checks runtime version to be 1.7.x or 1.8.x.
- * This will load pretty much first so we must do these checks here.
- */
- static {
- // Check 1.8 just in case for forward compatibility.
- int majorJavaVer = U.majorJavaVersion(U.jdkVersion());
-
- if (majorJavaVer < 7) {
- throw new IllegalStateException("Ignite requires Java 1.7.0_71 or above. Current Java version " +
- "is not supported: " + U.jdkVersion());
- }
-
- String jreVer = U.jreVersion();
-
- if (jreVer.startsWith("1.7")) {
- int upd = jreVer.indexOf('_');
- int beta = jreVer.indexOf('-');
-
- if (beta < 0)
- beta = jreVer.length();
-
- if (upd > 0 && beta > 0) {
- try {
- int update = Integer.parseInt(jreVer.substring(upd + 1, beta));
-
- boolean forceJ7 = IgniteSystemProperties.getBoolean(IGNITE_FORCE_START_JAVA7, false);
-
- if (update < 71 && !forceJ7) {
- throw new IllegalStateException("Ignite requires Java 1.7.0_71 or above. Current Java version " +
- "is not supported: " + jreVer);
- }
- else if (forceJ7)
- System.err.println("Ignite requires Java 1.7.0_71 or above. Start on your own risk.");
- }
- catch (NumberFormatException ignore) {
- // No-op
- }
- }
- }
-
- // To avoid nasty race condition in UUID.randomUUID() in JDK prior to 6u34.
- // For details please see:
- // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7071826
- // http://www.oracle.com/technetwork/java/javase/2col/6u34-bugfixes-1733379.html
- // http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/563d392b3e5c
- UUID.randomUUID();
- }
-
/**
* Enforces singleton.
*/
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 5a0402c..1b3e89f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -170,7 +170,6 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SECURITY_COMP
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME;
import static org.apache.ignite.internal.IgniteVersionUtils.VER;
import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT;
-import static org.apache.ignite.internal.processors.security.SecurityUtils.SERVICE_PERMISSIONS_SINCE;
import static org.apache.ignite.internal.processors.security.SecurityUtils.isSecurityCompatibilityMode;
import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.NOOP;
@@ -1333,9 +1332,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
", locNodeId=" + locNode.id() + ", rmtNode=" + U.toShortString(n) + "]");
}
- if (n.version().compareToIgnoreTimestamp(SERVICE_PERMISSIONS_SINCE) >= 0
- && ctx.security().enabled() // Matters only if security enabled.
- ) {
+ if (ctx.security().enabled()) {
Boolean rmtSecurityCompatibilityEnabled = n.attribute(ATTR_SECURITY_COMPATIBILITY_MODE);
if (!F.eq(locSecurityCompatibilityEnabled, rmtSecurityCompatibilityEnabled)) {
@@ -1350,19 +1347,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
", locNodeId=" + locNode.id() + ", rmtNode=" + U.toShortString(n) + "]");
}
}
-
- if (n.version().compareToIgnoreTimestamp(SERVICE_PERMISSIONS_SINCE) < 0
- && ctx.security().enabled() // Matters only if security enabled.
- && (locSecurityCompatibilityEnabled == null || !locSecurityCompatibilityEnabled)) {
- throw new IgniteCheckedException("Remote node does not support service security permissions. " +
- "To be able to join to it, local node must be started with " + IGNITE_SECURITY_COMPATIBILITY_MODE +
- " system property set to \"true\". " +
- "[locSecurityCompatibilityEnabled=" + locSecurityCompatibilityEnabled +
- ", locNodeAddrs=" + U.addressesAsString(locNode) +
- ", rmtNodeAddrs=" + U.addressesAsString(n) +
- ", locNodeId=" + locNode.id() + ", rmtNodeId=" + n.id() + ", " +
- ", rmtNodeVer" + n.version() + ", rmtNode=" + U.toShortString(n) + "]");
- }
}
if (log.isDebugEnabled())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
index 1cd6719..fbc3158 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
@@ -22,16 +22,12 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.apache.ignite.IgniteSystemProperties;
-import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.plugin.security.SecurityPermission;
/**
* Security utilities.
*/
public class SecurityUtils {
- /** Version since service security supported. */
- public static final IgniteProductVersion SERVICE_PERMISSIONS_SINCE = IgniteProductVersion.fromString("1.7.11");
-
/** Default serialization version. */
private static final int DFLT_SERIALIZE_VERSION = isSecurityCompatibilityMode() ? 1 : 2;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
index aa6ce44..ab0422d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
@@ -51,7 +51,6 @@ import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteCallable;
-import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.services.Service;
@@ -64,9 +63,6 @@ public class GridServiceProxy<T> implements Serializable {
/** */
private static final long serialVersionUID = 0L;
- /** */
- private static final IgniteProductVersion SVC_POOL_SINCE_VER = IgniteProductVersion.fromString("1.8.5");
-
/** Grid logger. */
@GridToStringExclude
private final IgniteLogger log;
@@ -184,8 +180,7 @@ public class GridServiceProxy<T> implements Serializable {
}
}
else {
- if (node.version().compareTo(SVC_POOL_SINCE_VER) >= 0)
- ctx.task().setThreadContext(TC_IO_POLICY, GridIoPolicy.SERVICE_POOL);
+ ctx.task().setThreadContext(TC_IO_POLICY, GridIoPolicy.SERVICE_POOL);
// Execute service remotely.
return ctx.closure().callAsyncNoFailover(