Repository: ignite Updated Branches: refs/heads/ignite-1093-2 afcfb5b72 -> 6629fea44
1093 Logs to handle race Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6629fea4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6629fea4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6629fea4 Branch: refs/heads/ignite-1093-2 Commit: 6629fea44195ed7dd91e73a78ba8ec747775fc28 Parents: afcfb5b Author: Anton Vinogradov <[email protected]> Authored: Thu Oct 15 23:59:29 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Oct 15 23:59:29 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionSupplier.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6629fea4/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 f908d0c..d68ce8b 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 @@ -187,8 +187,11 @@ class GridDhtPartitionSupplier { assert d != null; assert id != null; - if (!cctx.affinity().affinityTopologyVersion().equals(d.topologyVersion())) + if (!cctx.affinity().affinityTopologyVersion().equals(d.topologyVersion())) { + + U.log(log, "Demand request cancelled [current=" + cctx.affinity().affinityTopologyVersion() + ", demanded=" + d.topologyVersion() + "]"); return; + } GridDhtPartitionSupplyMessageV2 s = new GridDhtPartitionSupplyMessageV2( d.updateSequence(), cctx.cacheId(), d.topologyVersion()); @@ -609,7 +612,7 @@ class GridDhtPartitionSupplier { catch (ClusterTopologyCheckedException ignore) { // if (log.isDebugEnabled()) // log.debug - U.log(log,"Failed to send partition supply message because node left grid: " + n.id()); + U.log(log, "Failed to send partition supply message because node left grid: " + n.id()); clearContext(scMap.remove(scId), log);
