Repository: ignite Updated Branches: refs/heads/ignite-1.4 e35aa50b6 -> 4c6b8ff5e
ignite-gg-10720: fixing issue when IgniteNodeAttribute.MARSH is set to invalid value Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c6b8ff5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c6b8ff5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c6b8ff5 Branch: refs/heads/ignite-1.4 Commit: 4c6b8ff5e971108c0e42e7e845c59fff10bde1d0 Parents: e35aa50 Author: Denis Magda <[email protected]> Authored: Mon Sep 7 09:32:51 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Mon Sep 7 09:32:51 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/IgniteKernal.java | 7 ++++--- .../main/java/org/apache/ignite/internal/IgnitionEx.java | 10 +++++++++- .../java/org/apache/ignite/plugin/PluginProvider.java | 2 ++ 3 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4c6b8ff5/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 14d7c14..4209119 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 @@ -657,6 +657,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { * @param igfsExecSvc IGFS executor service. * @param restExecSvc Reset executor service. * @param errHnd Error handler to use for notification about startup problems. + * @param plugins Plugins. * @throws IgniteCheckedException Thrown in case of any errors. */ @SuppressWarnings({"CatchGenericClass", "unchecked"}) @@ -669,7 +670,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { ExecutorService mgmtExecSvc, ExecutorService igfsExecSvc, ExecutorService restExecSvc, - GridAbsClosure errHnd) + GridAbsClosure errHnd, + List<PluginProvider> plugins + ) throws IgniteCheckedException { gw.compareAndSet(null, new GridKernalGatewayImpl(cfg.getGridName())); @@ -758,8 +761,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { // Ack configuration. ackSpis(); - List<PluginProvider> plugins = U.allPluginProviders(); - // Spin out SPIs & managers. try { ctx = new GridKernalContextImpl(log, http://git-wip-us.apache.org/repos/asf/ignite/blob/4c6b8ff5/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- 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 02b28c5..b4c0dee 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 @@ -78,6 +78,7 @@ import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.mxbean.IgnitionMXBean; +import org.apache.ignite.plugin.PluginProvider; import org.apache.ignite.plugin.segmentation.SegmentationPolicy; import org.apache.ignite.resources.SpringApplicationContextResource; import org.apache.ignite.spi.IgniteSpi; @@ -1509,6 +1510,11 @@ public class IgnitionEx { IgniteConfiguration myCfg = initializeConfiguration(cfg); + List<PluginProvider> plugins = U.allPluginProviders(); + + for (PluginProvider provider : plugins) + provider.initConfiguration(myCfg); + // Set configuration URL, if any, into system property. if (startCtx.configUrl() != null) System.setProperty(IGNITE_CONFIG_URL, startCtx.configUrl().toString()); @@ -1620,7 +1626,9 @@ public class IgnitionEx { @Override public void apply() { startLatch.countDown(); } - }); + }, + plugins + ); state = STARTED; http://git-wip-us.apache.org/repos/asf/ignite/blob/4c6b8ff5/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java index 47acf0f..da67a35 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java @@ -57,6 +57,8 @@ public interface PluginProvider<C extends PluginConfiguration> { */ public <T extends IgnitePlugin> T plugin(); + public void initConfiguration(IgniteConfiguration cfg); + /** * Registers extensions. *
