HadoopProcessor is created through main classloader now.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e426953 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e426953 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e426953 Branch: refs/heads/ignite-3949 Commit: 9e4269530941e263cda8b9ed8b16394646332ecf Parents: 53237dd Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Sep 21 17:31:19 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Sep 21 17:31:19 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/IgniteComponentType.java | 57 -------------------- .../apache/ignite/internal/IgniteKernal.java | 22 +++----- 2 files changed, 8 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9e426953/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java index fa5240e..c39e9c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java @@ -199,32 +199,6 @@ public enum IgniteComponentType { /** * Creates component. * - * @param ctx Kernal context. - * @param ldr Class loader. - * @param mandatory If the component is mandatory. - * @return Created component. - * @throws IgniteCheckedException If failed. - */ - public <T> T createIfInClassPath(GridKernalContext ctx, ClassLoader ldr, boolean mandatory) - throws IgniteCheckedException { - String cls = clsName; - - try { - Class.forName(cls, true, ldr); - } - catch (ClassNotFoundException e) { - if (mandatory) - throw componentException(e); - - cls = noOpClsName; - } - - return create0(ctx, ldr, cls); - } - - /** - * Creates component. - * * @param noOp No-op flag. * @return Created component. * @throws IgniteCheckedException If failed. @@ -324,37 +298,6 @@ public enum IgniteComponentType { } /** - * Creates component instance. - * - * @param ctx Kernal context. - * @param ldr Class loader. - * @param clsName Component class name. - * @return Component instance. - * @throws IgniteCheckedException If failed. - */ - @SuppressWarnings("unchecked") - private <T> T create0(@Nullable GridKernalContext ctx, ClassLoader ldr, String clsName) - throws IgniteCheckedException { - try { - Class<?> cls = Class.forName(clsName, true, ldr); - - if (ctx == null) { - Constructor<?> ctor = cls.getConstructor(); - - return (T)ctor.newInstance(); - } - else { - Constructor<?> ctor = cls.getConstructor(GridKernalContext.class); - - return (T)ctor.newInstance(ctx); - } - } - catch (Throwable e) { - throw componentException(e); - } - } - - /** * Creates message factory for the component. * * @return Message factory or {@code null} if none or the component is not in classpath. http://git-wip-us.apache.org/repos/asf/ignite/blob/9e426953/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index ed2221d..dca4cf4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1143,9 +1143,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { throw new IgniteCheckedException("Hadoop module cannot be used with peer class loading enabled " + "(set IgniteConfiguration.peerClassLoadingEnabled to \"false\")."); - HadoopClassLoader ldr = ctx.hadoopHelper().commonClassLoader(); - - HadoopProcessorAdapter res = IgniteComponentType.HADOOP.createIfInClassPath(ctx, ldr, true); + HadoopProcessorAdapter res = IgniteComponentType.HADOOP.createIfInClassPath(ctx, true); res.validateEnvironment(); @@ -1160,19 +1158,15 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { "to use Hadoop module)."); } else { - if (!ctx.hadoopHelper().isNoOp()) { - HadoopClassLoader ldr = ctx.hadoopHelper().commonClassLoader(); - - cmp = IgniteComponentType.HADOOP.createIfInClassPath(ctx, ldr, false); + cmp = IgniteComponentType.HADOOP.createIfInClassPath(ctx, false); - try { - cmp.validateEnvironment(); - } - catch (IgniteException | IgniteCheckedException e) { - U.quietAndWarn(log, "Hadoop module will not start due to exception: " + e.getMessage()); + try { + cmp.validateEnvironment(); + } + catch (IgniteException | IgniteCheckedException e) { + U.quietAndWarn(log, "Hadoop module will not start due to exception: " + e.getMessage()); - cmp = null; - } + cmp = null; } }
