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 2018/11/14 17:16:11 UTC
ignite git commit: Added partition number in
ClusterTopologyServerNotFoundException message.
Repository: ignite
Updated Branches:
refs/heads/master d244225fb -> 2d86d7083
Added partition number in ClusterTopologyServerNotFoundException message.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2d86d708
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d86d708
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d86d708
Branch: refs/heads/master
Commit: 2d86d7083bf5adc1ac4f155f6378f4d77fd395de
Parents: d244225
Author: sboikov <sb...@apache.org>
Authored: Wed Nov 14 20:15:51 2018 +0300
Committer: sboikov <sb...@apache.org>
Committed: Wed Nov 14 20:15:51 2018 +0300
----------------------------------------------------------------------
.../distributed/dht/CacheDistributedGetFutureAdapter.java | 5 +++--
.../cache/distributed/dht/GridPartitionedGetFuture.java | 4 ++--
.../distributed/dht/GridPartitionedSingleGetFuture.java | 9 +++++----
.../cache/distributed/near/GridNearGetFuture.java | 4 ++--
4 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d86d708/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
index be25859..b1a9be0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
@@ -157,11 +157,12 @@ public abstract class CacheDistributedGetFutureAdapter<K, V> extends GridCacheCo
}
/**
+ * @param part Partition.
* @param topVer Topology version.
* @return Exception.
*/
- protected final ClusterTopologyServerNotFoundException serverNotFoundError(AffinityTopologyVersion topVer) {
+ protected final ClusterTopologyServerNotFoundException serverNotFoundError(int part, AffinityTopologyVersion topVer) {
return new ClusterTopologyServerNotFoundException("Failed to map keys for cache " +
- "(all partition nodes left the grid) [topVer=" + topVer + ", cache=" + cctx.name() + ']');
+ "(all partition nodes left the grid) [topVer=" + topVer + ", part" + part + ", cache=" + cctx.name() + ']');
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d86d708/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 387dbfa..f8a4ba4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -455,7 +455,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda
List<ClusterNode> affNodes = cctx.affinity().nodesByPartition(part, topVer);
if (affNodes.isEmpty()) {
- onDone(serverNotFoundError(topVer));
+ onDone(serverNotFoundError(part, topVer));
return false;
}
@@ -477,7 +477,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda
ClusterNode node = cctx.selectAffinityNodeBalanced(affNodes, canRemap);
if (node == null) {
- onDone(serverNotFoundError(topVer));
+ onDone(serverNotFoundError(part, topVer));
return false;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d86d708/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index 4dc72b2..f28a969 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -339,7 +339,7 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec
List<ClusterNode> affNodes = cctx.affinity().nodesByPartition(part, topVer);
if (affNodes.isEmpty()) {
- onDone(serverNotFoundError(topVer));
+ onDone(serverNotFoundError(part, topVer));
return null;
}
@@ -361,7 +361,7 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec
ClusterNode affNode = cctx.selectAffinityNodeBalanced(affNodes, canRemap);
if (affNode == null) {
- onDone(serverNotFoundError(topVer));
+ onDone(serverNotFoundError(part, topVer));
return null;
}
@@ -718,12 +718,13 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec
}
/**
+ * @param part Partition.
* @param topVer Topology version.
* @return Exception.
*/
- private ClusterTopologyServerNotFoundException serverNotFoundError(AffinityTopologyVersion topVer) {
+ private ClusterTopologyServerNotFoundException serverNotFoundError(int part, AffinityTopologyVersion topVer) {
return new ClusterTopologyServerNotFoundException("Failed to map keys for cache " +
- "(all partition nodes left the grid) [topVer=" + topVer + ", cache=" + cctx.name() + ']');
+ "(all partition nodes left the grid) [topVer=" + topVer + ", part=" + part + ", cache=" + cctx.name() + ']');
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d86d708/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index d3c0245..62a5dbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -423,7 +423,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
List<ClusterNode> affNodes = cctx.affinity().nodesByPartition(part, topVer);
if (affNodes.isEmpty()) {
- onDone(serverNotFoundError(topVer));
+ onDone(serverNotFoundError(part, topVer));
return null;
}
@@ -495,7 +495,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
ClusterNode affNode = cctx.selectAffinityNodeBalanced(affNodes, canRemap);
if (affNode == null) {
- onDone(serverNotFoundError(topVer));
+ onDone(serverNotFoundError(part, topVer));
return saved;
}