Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B6D4A188C2 for ; Thu, 23 Jul 2015 13:50:06 +0000 (UTC) Received: (qmail 24504 invoked by uid 500); 23 Jul 2015 13:49:32 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 24472 invoked by uid 500); 23 Jul 2015 13:49:32 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 24463 invoked by uid 99); 23 Jul 2015 13:49:32 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2015 13:49:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id E3D6E1A7671 for ; Thu, 23 Jul 2015 13:49:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 73UugGrOsZ6E for ; Thu, 23 Jul 2015 13:49:23 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 5A29243CC9 for ; Thu, 23 Jul 2015 13:49:23 +0000 (UTC) Received: (qmail 24357 invoked by uid 99); 23 Jul 2015 13:49:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2015 13:49:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BC10EE3AAA; Thu, 23 Jul 2015 13:49:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.incubator.apache.org Message-Id: <394f3a68e95246dcaef261cb1b107793@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: IGNITE-1108 Fixed reviewe notes. Date: Thu, 23 Jul 2015 13:49:22 +0000 (UTC) Repository: incubator-ignite Updated Branches: refs/heads/ignite-1108 a05ed1253 -> 0e779a0f7 IGNITE-1108 Fixed reviewe notes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e779a0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e779a0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e779a0f Branch: refs/heads/ignite-1108 Commit: 0e779a0f77ce8c2970d944aea5ff577e6c6eecfa Parents: a05ed12 Author: nikolay_tikhonov Authored: Thu Jul 23 16:49:28 2015 +0300 Committer: nikolay_tikhonov Committed: Thu Jul 23 16:49:28 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 18 --------------- .../plugin/IgnitePluginProcessor.java | 24 +++++++++++++++++--- .../apache/ignite/plugin/PluginProvider.java | 3 ++- .../ignite/plugin/PluginProviderAdapter.java | 2 +- .../internal/util/TestPluginProvider.java | 2 +- 5 files changed, 25 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e779a0f/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 5eced59..024dc7b 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 @@ -1801,24 +1801,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } } - // TODO: This should be inside IgnitePluginProcessor.stop() I think. - // Invoke callback on plugins. - if (ctx.plugins() != null && ctx.plugins().allProviders() != null) { - for (PluginProvider plugin : ctx.plugins().allProviders()) { - try { - plugin.onAfterStop(cancel); - } - catch (Throwable e) { - errOnStop = true; - - U.error(log, "Failed to invoke afterStop for plugin (ignoring): " + plugin, e); - - if (e instanceof Error) - throw (Error)e; - } - } - } - // Stops lifecycle aware components. U.stopLifecycleAware(log, lifecycleAwares(cfg)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e779a0f/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java index fe551b5..aa9778f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java @@ -132,14 +132,32 @@ public class IgnitePluginProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void start() throws IgniteCheckedException { - for (PluginProvider plugin : plugins.values()) - // TODO: Why not passing PluginContext here? We already have it at that point. - plugin.onBeforeStart(); + for (Map.Entry e : pluginCtxMap.entrySet()) + e.getKey().onBeforeStart(e.getValue()); ackPluginsInfo(); } /** {@inheritDoc} */ + @Override public void stop(boolean cancel) throws IgniteCheckedException { + boolean errOnStop = false; + + for (PluginProvider plugin : plugins.values()) { + try { + plugin.onAfterStop(cancel); + } + catch (Exception e) { + errOnStop = true; + + U.error(log, "Failed to invoke afterStop for plugin (ignoring): " + plugin, e); + } + } + + if (errOnStop) + throw new IgniteCheckedException("Failed to stop plugins."); + } + + /** {@inheritDoc} */ @Nullable @Override public DiscoveryDataExchangeType discoveryDataType() { return DiscoveryDataExchangeType.PLUGIN; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e779a0f/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 a020991..e1e39c9 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 @@ -77,9 +77,10 @@ public interface PluginProvider { /** * Callback that notifies that Ignite prepares to start plugin. * + * @param ctx Plugin context. * @throws IgniteCheckedException Thrown in case of any errors. */ - public void onBeforeStart() throws IgniteCheckedException; + public void onBeforeStart(PluginContext ctx) throws IgniteCheckedException; /** * Starts grid component. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e779a0f/modules/core/src/main/java/org/apache/ignite/plugin/PluginProviderAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProviderAdapter.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProviderAdapter.java index bef7000..06d4973 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProviderAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProviderAdapter.java @@ -59,7 +59,7 @@ public class PluginProviderAdapter implements Plu } /** {@inheritDoc} */ - @Override public void onBeforeStart() throws IgniteCheckedException { + @Override public void onBeforeStart(PluginContext ctx) throws IgniteCheckedException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e779a0f/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java b/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java index 3e15a88..98bd974 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java @@ -50,7 +50,7 @@ public class TestPluginProvider extends PluginProviderAdapter