You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/12/29 11:01:10 UTC
ignite git commit: ERROR log for errors during rebalance.
Repository: ignite
Updated Branches:
refs/heads/master 46e4e557d -> 63a312518
ERROR log for errors during rebalance.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/63a31251
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/63a31251
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/63a31251
Branch: refs/heads/master
Commit: 63a31251879d7b8058eb8fb422f9d655f74c61fb
Parents: 46e4e55
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 29 14:01:00 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 29 14:01:00 2017 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionDemander.java | 30 +++++++++++---------
1 file changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/63a31251/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 8859950..d6f15c9 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
@@ -60,6 +60,7 @@ import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.CI1;
import org.apache.ignite.internal.util.typedef.T2;
+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.IgniteInClosure;
@@ -609,11 +610,11 @@ public class GridDhtPartitionDemander {
return;
if (log.isDebugEnabled())
- log.debug("Received supply message: " + supply);
+ log.debug("Received supply message [grp=" + grp.cacheOrGroupName() + ", msg=" + supply + ']');
// Check whether there were class loading errors on unmarshal
if (supply.classError() != null) {
- U.warn(log, "Rebalancing from node cancelled [node=" + id +
+ U.warn(log, "Rebalancing from node cancelled [grp=" + grp.cacheOrGroupName() + ", node=" + id +
"]. Class got undeployed during preloading: " + supply.classError());
fut.cancel(id);
@@ -744,19 +745,22 @@ public class GridDhtPartitionDemander {
if (!topologyChanged(fut) && !fut.isDone()) {
// Send demand message.
- ctx.io().sendOrderedMessage(node, rebalanceTopics.get(idx),
- d, grp.ioPolicy(), grp.config().getRebalanceTimeout());
+ try {
+ ctx.io().sendOrderedMessage(node, rebalanceTopics.get(idx),
+ d, grp.ioPolicy(), grp.config().getRebalanceTimeout());
+ }
+ catch (ClusterTopologyCheckedException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("Node left during rebalancing [grp=" + grp.cacheOrGroupName() +
+ ", node=" + node.id() + ", msg=" + e.getMessage() + ']');
+ }
+ }
}
}
- catch (IgniteCheckedException e) {
- if (log.isDebugEnabled())
- 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() + ']');
+ catch (IgniteSpiException | IgniteCheckedException e) {
+ LT.error(log, e, "Error during rebalancing [grp=" + grp.cacheOrGroupName() +
+ ", srcNode=" + node.id() +
+ ", err=" + e + ']');
}
}