Repository: ignite Updated Branches: refs/heads/ignite-1093-3 8033dc77f -> 76bf28ae0
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/76bf28ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/76bf28ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/76bf28ae Branch: refs/heads/ignite-1093-3 Commit: 76bf28ae0976d5fff66607145cf47a59e02a6e34 Parents: 8033dc7 Author: Anton Vinogradov <[email protected]> Authored: Wed Oct 28 17:33:37 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Wed Oct 28 17:33:37 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionDemander.java | 8 +++++++- .../distributed/dht/preloader/GridDhtPartitionSupplier.java | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/76bf28ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index adb6de2..ee603e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -67,6 +67,7 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.spi.IgniteSpiException; import org.jetbrains.annotations.Nullable; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -379,7 +380,7 @@ public class GridDhtPartitionDemander { synchronized (fut) { if (!fut.isDone())// Future can be already cancelled at this moment and all failovers happened. - // New requests will not be covered by failovers. + // New requests will not be covered by failovers. cctx.io().sendOrderedMessage(node, GridCachePartitionExchangeManager.rebalanceTopic(cnt), initD, cctx.ioPolicy(), initD.timeout()); } @@ -592,6 +593,11 @@ public class GridDhtPartitionDemander { log.debug("Node left during rebalancing [node=" + node.id() + ", msg=" + e.getMessage() + ']'); } + catch (IgniteSpiException e) { + if (log.isDebugEnabled()) + log.debug("Failed to send message to node (current node is stopping?) [node=" + node.id() + + ", msg=" + e.getMessage() + ']'); + } } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/76bf28ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java index 9db2dc7..53ca073 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java @@ -41,6 +41,7 @@ import org.apache.ignite.internal.util.typedef.CI2; import org.apache.ignite.internal.util.typedef.T3; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.spi.IgniteSpiException; import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.OWNING; @@ -584,6 +585,11 @@ class GridDhtPartitionSupplier { catch (IgniteCheckedException e) { U.error(log, "Failed to send partition supply message to node: " + id, e); } + catch (IgniteSpiException e) { + if (log.isDebugEnabled()) + log.debug("Failed to send message to node (current node is stopping?) [node=" + node.id() + + ", msg=" + e.getMessage() + ']'); + } } /**
