You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2021/09/01 06:13:48 UTC
[ignite] branch master updated: IGNITE-14725 Server node fail when
client node send unsupported class version (#9360)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 93460a3 IGNITE-14725 Server node fail when client node send unsupported class version (#9360)
93460a3 is described below
commit 93460a374748e122073e0a82515c8bfa7dbd38c9
Author: Nikolay <ni...@apache.org>
AuthorDate: Wed Sep 1 09:13:25 2021 +0300
IGNITE-14725 Server node fail when client node send unsupported class version (#9360)
---
.../managers/communication/GridIoManager.java | 2 +-
.../managers/deployment/GridDeployment.java | 14 +-
.../deployment/GridDeploymentClassLoader.java | 8 +-
.../deployment/GridDeploymentPerLoaderStore.java | 9 +-
.../deployment/GridDeploymentPerVersionStore.java | 21 ++-
.../eventstorage/GridEventStorageManager.java | 2 +-
.../processors/affinity/GridAffinityUtils.java | 2 +-
.../cache/GridCacheDeploymentManager.java | 52 ++++--
.../internal/processors/job/GridJobProcessor.java | 2 +-
.../processors/platform/cache/PlatformCache.java | 9 +-
.../internal/processors/service/ServiceInfo.java | 2 +-
.../processors/task/GridTaskProcessor.java | 9 +-
.../ignite/p2p/P2PScanQueryUndeployTest.java | 2 +-
.../ignite/p2p/P2PUnsupportedClassVersionTest.java | 204 +++++++++++++++++++++
.../apache/ignite/p2p/SharedDeploymentTest.java | 2 +-
.../ignite/testsuites/IgniteP2PSelfTestSuite.java | 2 +
16 files changed, 287 insertions(+), 55 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index e534c08..c055b04 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -3666,7 +3666,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
// Resource injection.
if (dep != null)
- ctx.resource().inject(dep, dep.deployedClass(ioMsg.deploymentClassName()), msgBody);
+ ctx.resource().inject(dep, dep.deployedClass(ioMsg.deploymentClassName()).get1(), msgBody);
}
catch (IgniteCheckedException e) {
U.error(log, "Failed to unmarshal user message [node=" + nodeId + ", message=" +
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java
index 7d9e34f..a961c49 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java
@@ -452,9 +452,11 @@ public class GridDeployment extends GridMetadataAwareAdapter implements GridDepl
* @return Class for given name.
*/
@SuppressWarnings({"StringEquality"})
- @Nullable public Class<?> deployedClass(String clsName, String... alias) {
+ @Nullable public IgniteBiTuple<Class<?>, Throwable> deployedClass(String clsName, String... alias) {
Class<?> cls = clss.get(clsName);
+ Throwable err = null;
+
if (cls == null) {
try {
cls = U.forName(clsName, clsLdr);
@@ -469,13 +471,15 @@ public class GridDeployment extends GridMetadataAwareAdapter implements GridDepl
onDeployed(cls);
}
}
- catch (ClassNotFoundException ignored) {
+ catch (ClassNotFoundException | LinkageError e) {
+ err = e;
+
// Check aliases.
for (String a : alias) {
cls = clss.get(a);
if (cls != null)
- return cls;
+ return F.t(cls, null);
else if (!a.equals(clsName)) {
try {
cls = U.forName(a, clsLdr);
@@ -497,7 +501,7 @@ public class GridDeployment extends GridMetadataAwareAdapter implements GridDepl
onDeployed(cls);
}
- return cls;
+ return F.t(cls, null);
}
}
}
@@ -507,7 +511,7 @@ public class GridDeployment extends GridMetadataAwareAdapter implements GridDepl
}
}
- return cls;
+ return F.t(cls, err);
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
index 925c033..a55035d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
@@ -529,7 +529,7 @@ class GridDeploymentClassLoader extends ClassLoader implements GridDeploymentInf
if (log.isDebugEnabled())
log.debug("Found class in local deployment [cls=" + name + ", dep=" + dep + ']');
- return dep.deployedClass(name);
+ return dep.deployedClass(name).get1();
}
}
@@ -541,13 +541,13 @@ class GridDeploymentClassLoader extends ClassLoader implements GridDeploymentInf
Class<?> cls = findLoadedClass(name);
if (cls == null) {
- if (byteMap != null)
- byteMap.put(path, byteSrc.array());
-
cls = ctx.security().sandbox().enabled()
? defineClass(name, byteSrc.internalArray(), 0, byteSrc.size(), PROTECTION_DOMAIN)
: defineClass(name, byteSrc.internalArray(), 0, byteSrc.size());
+ if (byteMap != null)
+ byteMap.put(path, byteSrc.array());
+
/* Define package in classloader. See URLClassLoader.defineClass(). */
int i = name.lastIndexOf('.');
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
index ba68e1bc..9d169c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
@@ -38,6 +38,7 @@ import org.apache.ignite.internal.util.GridAnnotationsCache;
import org.apache.ignite.internal.util.GridClassLoaderCache;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.marshaller.AbstractMarshaller;
import org.apache.ignite.spi.deployment.DeploymentSpi;
@@ -248,7 +249,7 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter {
// If we received execution request even after we waited for P2P
// timeout period, we simply ignore it.
else if (d.sequenceNumber() > meta.sequenceNumber()) {
- if (d.deployedClass(meta.className()) != null) {
+ if (d.deployedClass(meta.className()).get1() != null) {
long time = U.currentTimeMillis() - d.timestamp();
if (time < ctx.config().getNetworkTimeout()) {
@@ -319,10 +320,10 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter {
// Make sure that requested class is loaded and cached.
if (dep != null) {
- Class<?> cls = dep.deployedClass(meta.className(), meta.alias());
+ IgniteBiTuple<Class<?>, Throwable> cls = dep.deployedClass(meta.className(), meta.alias());
- if (cls == null) {
- U.warn(log, "Failed to load peer class [alias=" + meta.alias() + ", dep=" + dep + ']');
+ if (cls.get1() == null) {
+ U.warn(log, "Failed to load peer class [alias=" + meta.alias() + ", dep=" + dep + ']', cls.get2());
return null;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index 5d536d0..5c2e841 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -47,6 +47,7 @@ import org.apache.ignite.internal.util.typedef.P1;
import org.apache.ignite.internal.util.typedef.internal.LT;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.marshaller.AbstractMarshaller;
import org.apache.ignite.spi.deployment.DeploymentSpi;
@@ -438,11 +439,11 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
log.debug("Found SHARED or CONTINUOUS deployment after first check: " + dep);
// Cache the deployed class.
- Class<?> cls = dep.deployedClass(meta.className(), meta.alias());
+ IgniteBiTuple<Class<?>, Throwable> cls = dep.deployedClass(meta.className(), meta.alias());
- if (cls == null) {
+ if (cls.get1() == null) {
U.warn(log, "Failed to load peer class (ignore if class got undeployed during preloading) [alias=" +
- meta.alias() + ", dep=" + dep + ']');
+ meta.alias() + ", dep=" + dep + ']', cls.get2());
return null;
}
@@ -464,7 +465,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
for (SharedDeployment d : depsToCheck) {
// Load class. Note, that remote node will not load this class.
// The class will only be loaded on this node.
- Class<?> cls = d.deployedClass(meta.className(), meta.alias());
+ Class<?> cls = d.deployedClass(meta.className(), meta.alias()).get1();
if (cls != null) {
synchronized (mux) {
@@ -508,11 +509,11 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
}
}
- Class<?> depCls = d.deployedClass(meta.className(), meta.alias());
+ IgniteBiTuple<Class<?>, Throwable> depCls = d.deployedClass(meta.className(), meta.alias());
- if (depCls == null) {
+ if (depCls.get1() == null) {
U.error(log, "Failed to peer load class after loading it as a resource [alias=" +
- meta.alias() + ", dep=" + dep + ']');
+ meta.alias() + ", dep=" + dep + ']', depCls.get2());
return null;
}
@@ -593,11 +594,11 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
if (dep != null) {
// Cache the deployed class.
- Class<?> cls = dep.deployedClass(meta.className(), meta.alias());
+ IgniteBiTuple<Class<?>, Throwable> cls = dep.deployedClass(meta.className(), meta.alias());
- if (cls == null) {
+ if (cls.get1() == null) {
U.warn(log, "Failed to load peer class (ignore if class got undeployed during preloading) [alias=" +
- meta.alias() + ", dep=" + dep + ']');
+ meta.alias() + ", dep=" + dep + ']', cls.get2());
return null;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index 7bb8c37..6c9aced 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -1223,7 +1223,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
filter = U.unmarshal(marsh, req.filter(), U.resolveClassLoader(dep.classLoader(), ctx.config()));
// Resource injection.
- ctx.resource().inject(dep, dep.deployedClass(req.filterClassName()), filter);
+ ctx.resource().inject(dep, dep.deployedClass(req.filterClassName()).get1(), filter);
// Get local events.
evts = localEvents(filter);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
index c43ab39..46a516f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
@@ -114,7 +114,7 @@ class GridAffinityUtils {
U.resolveClassLoader(dep.classLoader(), ctx.config()));
// Resource injection.
- ctx.resource().inject(dep, dep.deployedClass(msg.sourceClassName()), src);
+ ctx.resource().inject(dep, dep.deployedClass(msg.sourceClassName()).get1(), src);
return src;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
index 31c2b14..a894d3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
@@ -48,6 +48,7 @@ import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.LT;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentLinkedHashMap;
@@ -556,7 +557,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
// If current deployment is either system loader or GG loader,
// then we don't check it, as new loader is most likely wider.
- if (!curLdr.equals(U.gridClassLoader()) && dep.deployedClass(cls.getName()) != null)
+ if (!curLdr.equals(U.gridClassLoader()) && dep.deployedClass(cls.getName()).get1() != null)
// Local deployment can load this class already, so no reason
// to look for another class loader.
break;
@@ -567,7 +568,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
if (newDep != null) {
if (dep != null) {
// Check new deployment.
- if (newDep.deployedClass(dep.sampleClassName()) != null) {
+ if (newDep.deployedClass(dep.sampleClassName()).get1() != null) {
if (locDep.compareAndSet(dep, newDep))
break; // While loop.
}
@@ -774,7 +775,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
GridDeployment d = cctx.gridDeploy().getLocalDeployment(name);
if (d != null) {
- Class cls = d.deployedClass(name);
+ Class cls = d.deployedClass(name).get1();
if (cls != null)
return cls;
@@ -783,29 +784,43 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
IgniteUuid curLdrId = localLdrId.get();
+ Throwable err = null;
+
if (curLdrId != null) {
CachedDeploymentInfo<K, V> t = deps.get(curLdrId);
if (t != null) {
- Class<?> cls = tryToloadClassFromCacheDep(name, t);
+ IgniteBiTuple<Class<?>, Throwable> cls = tryToloadClassFromCacheDep(name, t);
- if (cls != null)
- return cls;
+ if (cls != null) {
+ if (cls.get1() != null)
+ return cls.get1();
+ else
+ err = cls.get2();
+ }
}
}
for (CachedDeploymentInfo<K, V> t : deps.values()) {
- Class<?> cls = tryToloadClassFromCacheDep(name, t);
- if (cls != null)
- return cls;
- }
+ IgniteBiTuple<Class<?>, Throwable> cls = tryToloadClassFromCacheDep(name, t);
- Class cls = getParent().loadClass(name);
+ if (cls != null) {
+ if (cls.get1() != null)
+ return cls.get1();
+ else if (err == null)
+ err = cls.get2();
+ }
+ }
- if (cls != null)
- return cls;
+ try {
+ return getParent().loadClass(name);
+ }
+ catch (ClassNotFoundException e) {
+ if (err instanceof LinkageError)
+ U.warn(log, "Failed to load class [name=" + name + ']', err);
- throw new ClassNotFoundException("Failed to load class [name=" + name + ", ctx=" + deps + ']');
+ throw e;
+ }
}
/**
@@ -813,7 +828,10 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
* @param deploymentInfo Grid cached deployment info.
* @return Class if can to load resource with the <code>name</code> or {@code null} otherwise.
*/
- @Nullable private Class<?> tryToloadClassFromCacheDep(String name, CachedDeploymentInfo<K, V> deploymentInfo) {
+ @Nullable private IgniteBiTuple<Class<?>, Throwable> tryToloadClassFromCacheDep(
+ String name,
+ CachedDeploymentInfo<K, V> deploymentInfo
+ ) {
UUID sndId = deploymentInfo.senderId();
IgniteUuid ldrId = deploymentInfo.loaderId();
String userVer = deploymentInfo.userVersion();
@@ -830,9 +848,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
participants,
F.<ClusterNode>alwaysTrue());
- Class cls = d != null ? d.deployedClass(name) : null;
-
- return cls;
+ return d != null ? d.deployedClass(name) : null;
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 679834b..f47db23 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -1296,7 +1296,7 @@ public class GridJobProcessor extends GridProcessorAdapter {
// If exception occurs on job initialization, deployment is released in job listener.
releaseDep = false;
- if (job.initialize(dep, dep.deployedClass(req.getTaskClassName()))) {
+ if (job.initialize(dep, dep.deployedClass(req.getTaskClassName()).get1())) {
// Internal jobs will always be executed synchronously.
if (job.isInternal()) {
// This is an internal job and can be executed inside busy lock
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index 46bef37..f6a1ed6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -78,6 +78,7 @@ import org.apache.ignite.internal.util.GridConcurrentFactory;
import org.apache.ignite.internal.util.typedef.C1;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.transactions.TransactionDeadlockException;
import org.apache.ignite.transactions.TransactionTimeoutException;
@@ -803,14 +804,14 @@ public class PlatformCache extends PlatformAbstractTarget {
throw new IgniteDeploymentCheckedException("Unknown CacheEntryProcessor name or failed to " +
"auto-deploy entry processor (was entry processor (re|un)deployed?): " + procName);
- Class<?> procCls = dep.deployedClass(procName);
+ IgniteBiTuple<Class<?>, Throwable> procCls = dep.deployedClass(procName);
- if (procCls == null)
+ if (procCls.get1() == null)
throw new IgniteDeploymentCheckedException("Unknown CacheEntryProcessor name or failed to " +
"auto-deploy entry processor (was entry processor (re|un)deployed?) [procName=" +
- procName + ", dep=" + dep + ']');
+ procName + ", dep=" + dep + ']', procCls.get2());
- if (!CacheEntryProcessor.class.isAssignableFrom(procCls))
+ if (!CacheEntryProcessor.class.isAssignableFrom(procCls.get1()))
throw new IgniteCheckedException("Failed to auto-deploy entry processor (deployed class is " +
"not an entry processor) [procName=" + procName + ", depCls=" + procCls + ']');
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceInfo.java
index 67a94c5..6a502c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceInfo.java
@@ -150,7 +150,7 @@ public class ServiceInfo implements ServiceDescriptor {
GridDeployment srvcDep = ctx.deploy().getDeployment(clsName);
if (srvcDep != null) {
- srvcCls = (Class<? extends Service>)srvcDep.deployedClass(clsName);
+ srvcCls = (Class<? extends Service>)srvcDep.deployedClass(clsName).get1();
if (srvcCls != null)
return srvcCls;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 4cbbf9a..da7f6ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -77,6 +77,7 @@ import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.LT;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorTaskArgument;
+import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lang.IgniteUuid;
@@ -643,11 +644,13 @@ public class GridTaskProcessor extends GridProcessorAdapter implements IgniteCha
throw new IgniteDeploymentCheckedException("Unknown task name or failed to auto-deploy " +
"task (was task (re|un)deployed?): " + taskName);
- taskCls = dep.deployedClass(taskName);
+ IgniteBiTuple<Class<?>, Throwable> cls = dep.deployedClass(taskName);
- if (taskCls == null)
+ if (cls.get1() == null)
throw new IgniteDeploymentCheckedException("Unknown task name or failed to auto-deploy " +
- "task (was task (re|un)deployed?) [taskName=" + taskName + ", dep=" + dep + ']');
+ "task (was task (re|un)deployed?) [taskName=" + taskName + ", dep=" + dep + ']', cls.get2());
+
+ taskCls = cls.get1();
if (!ComputeTask.class.isAssignableFrom(taskCls))
throw new IgniteCheckedException("Failed to auto-deploy task (deployed class is not a task) " +
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/P2PScanQueryUndeployTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/P2PScanQueryUndeployTest.java
index e954e47..253e3df 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/P2PScanQueryUndeployTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/P2PScanQueryUndeployTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
/** */
public class P2PScanQueryUndeployTest extends GridCommonAbstractTest {
/** Predicate classname. */
- private static final String PREDICATE_CLASSNAME = "org.apache.ignite.tests.p2p.AlwaysTruePredicate";
+ public static final String PREDICATE_CLASSNAME = "org.apache.ignite.tests.p2p.AlwaysTruePredicate";
/** */
private static final String TEST_PREDICATE_RESOURCE_NAME = U.classNameToResourceName(PREDICATE_CLASSNAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/P2PUnsupportedClassVersionTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/P2PUnsupportedClassVersionTest.java
new file mode 100644
index 0000000..8acd00f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/P2PUnsupportedClassVersionTest.java
@@ -0,0 +1,204 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
+package org.apache.ignite.p2p;
+
+import java.lang.reflect.Method;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteDeploymentException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheEntryProcessor;
+import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.failure.StopNodeFailureHandler;
+import org.apache.ignite.internal.managers.communication.GridIoMessage;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentResponse;
+import org.apache.ignite.internal.util.GridByteArrayList;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.testframework.ListeningTestLogger;
+import org.apache.ignite.testframework.LogListener;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+import static org.apache.ignite.p2p.P2PScanQueryUndeployTest.PREDICATE_CLASSNAME;
+import static org.apache.ignite.p2p.SharedDeploymentTest.RUN_LAMBDA;
+import static org.apache.ignite.testframework.GridTestUtils.assertThrowsWithCause;
+
+/** Tests user error (not server node failure) in case compute task compiled in unsupported bytecode version. */
+public class P2PUnsupportedClassVersionTest extends GridCommonAbstractTest {
+ /** */
+ public static final String ENTRY_PROC_CLS_NAME = "org.apache.ignite.tests.p2p.CacheDeploymentBinaryEntryProcessor";
+
+ /** */
+ private static ListeningTestLogger lsnrLog;
+
+ /** */
+ private static Ignite srv;
+
+ /** */
+ private static Ignite cli;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ return super.getConfiguration(igniteInstanceName)
+ .setPeerClassLoadingEnabled(true)
+ .setCommunicationSpi(new SendComputeWithHigherClassVersionSpi())
+ .setFailureHandler(new StopNodeFailureHandler())
+ .setGridLogger(lsnrLog);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ lsnrLog = new ListeningTestLogger(false, log);
+
+ srv = startGrid("server");
+ cli = startClientGrid("client");
+ }
+
+ /** */
+ @Test
+ public void testEntryProcessor() throws Exception {
+ IgniteCache<String, String> cache = cli.getOrCreateCache("my-cache");
+
+ cache.put("1", "1");
+
+ LogListener errMsgLsnr = errorMessageListener(ENTRY_PROC_CLS_NAME);
+
+ CacheEntryProcessor<String, String, Boolean> proc = (CacheEntryProcessor<String, String, Boolean>)
+ getExternalClassLoader().loadClass(ENTRY_PROC_CLS_NAME).newInstance();
+
+ assertThrowsWithCause(() -> cache.invoke("1", proc), IgniteCheckedException.class);
+
+ assertTrue(errMsgLsnr.check());
+
+ // Check node is alive.
+ cache.put("2", "2");
+ }
+
+ /** */
+ @Test
+ public void testCompute() throws Exception {
+ Class<?> lambdaFactoryCls = getExternalClassLoader().loadClass(RUN_LAMBDA);
+
+ Method method = lambdaFactoryCls.getMethod("lambda");
+
+ IgniteCallable<Integer> lambda = (IgniteCallable<Integer>)method.invoke(lambdaFactoryCls);
+
+ LogListener errMsgLsnr = errorMessageListener(RUN_LAMBDA);
+
+ assertThrowsWithCause(
+ () -> cli.compute(cli.cluster().forServers()).broadcast(lambda),
+ IgniteDeploymentException.class
+ );
+
+ assertTrue(errMsgLsnr.check());
+
+ // Check node is alive.
+ cli.createCache("Can_create_cache_after_compute_fail");
+ }
+
+ /** */
+ @Test
+ public void testScanQuery() throws Exception {
+ IgniteCache<String, String> cache = cli.getOrCreateCache(DEFAULT_CACHE_NAME);
+
+ cache.put("3", "3");
+
+ LogListener errMsgLsnr = errorMessageListener(PREDICATE_CLASSNAME);
+
+ assertThrowsWithCause(() -> {
+ try {
+ cache.query(new ScanQuery<>((IgniteBiPredicate<Integer, Integer>)
+ getExternalClassLoader().loadClass(PREDICATE_CLASSNAME).newInstance()
+ )).getAll();
+ }
+ catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
+ throw new IgniteException(e);
+ }
+ }, IgniteCheckedException.class);
+
+ assertTrue(errMsgLsnr.check());
+
+ // Check node is alive.
+ cache.put("4", "4");
+ }
+
+ /** Custom communication SPI for simulating {@link UnsupportedClassVersionError} on server node. */
+ private static class SendComputeWithHigherClassVersionSpi extends TcpCommunicationSpi {
+ /** {@inheritDoc} */
+ @Override public void sendMessage(
+ ClusterNode node,
+ Message msg,
+ IgniteInClosure<IgniteException> ackC
+ ) throws IgniteSpiException {
+ try {
+ if (msg instanceof GridIoMessage) {
+ Message msg0 = ((GridIoMessage)msg).message();
+
+ if (msg0 instanceof GridDeploymentResponse)
+ incComputeClassVersion((GridDeploymentResponse)msg0);
+ }
+ }
+ catch (Exception e) {
+ throw new IgniteException(e);
+ }
+
+ super.sendMessage(node, msg, ackC);
+ }
+
+ /** */
+ private void incComputeClassVersion(GridDeploymentResponse resp) {
+ GridByteArrayList byteSrc = U.field(resp, "byteSrc");
+
+ // Assert byte array contains class file.
+ assertEquals(0xCAFEBABE, byteSrc.getInt(0));
+
+ // Assert minor version and first byte of major class version is zero.
+ assertEquals(0, byteSrc.get(4));
+ assertEquals(0, byteSrc.get(5));
+ assertEquals(0, byteSrc.get(6));
+
+ byte majorClsVer = byteSrc.get(7);
+
+ assertTrue(byteSrc.get(7) > 0);
+
+ byteSrc.set(7, (byte)(majorClsVer + 1));
+ }
+ }
+
+ /** */
+ private LogListener errorMessageListener(String clsName) {
+ LogListener errMsgLsnr = LogListener
+ .matches(UnsupportedClassVersionError.class.getName() + ": " + clsName.replace(".", "/"))
+ .build();
+
+ lsnrLog.registerListener(errMsgLsnr);
+
+ return errMsgLsnr;
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java
index ea16992..0d4b6cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java
@@ -43,7 +43,7 @@ public class SharedDeploymentTest extends GridCommonAbstractTest {
private static final String RUN_CLS2 = "org.apache.ignite.tests.p2p.compute.ExternalCallable2";
/** */
- private static final String RUN_LAMBDA = "org.apache.ignite.tests.p2p.compute.ExternalLambda";
+ public static final String RUN_LAMBDA = "org.apache.ignite.tests.p2p.compute.ExternalLambda";
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java
index e788aea..7131a30 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java
@@ -42,6 +42,7 @@ import org.apache.ignite.p2p.GridP2PTimeoutSelfTest;
import org.apache.ignite.p2p.GridP2PUndeploySelfTest;
import org.apache.ignite.p2p.P2PScanQueryUndeployTest;
import org.apache.ignite.p2p.P2PStreamingClassLoaderTest;
+import org.apache.ignite.p2p.P2PUnsupportedClassVersionTest;
import org.apache.ignite.p2p.SharedDeploymentTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -77,6 +78,7 @@ import org.junit.runners.Suite;
P2PCacheOperationIntoComputeTest.class,
GridP2PContinuousDeploymentClientDisconnectTest.class,
GridDifferentLocalDeploymentSelfTest.class,
+ P2PUnsupportedClassVersionTest.class
})
public class IgniteP2PSelfTestSuite {
}