ignite-1811
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/caaab6e5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/caaab6e5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/caaab6e5 Branch: refs/heads/ignite-1811 Commit: caaab6e541a532a9815e40f27337a2c244ba21ef Parents: 98d470a Author: sboikov <[email protected]> Authored: Fri Jan 15 15:07:16 2016 +0300 Committer: sboikov <[email protected]> Committed: Fri Jan 15 15:07:16 2016 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridClientPartitionTopology.java | 2 +- .../cache/distributed/dht/GridPartitionedGetFuture.java | 2 ++ .../processors/cache/distributed/near/GridNearGetFuture.java | 4 +++- .../cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caaab6e5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java index f0c4c90..dcfc038 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java @@ -882,7 +882,7 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology { /** {@inheritDoc} */ @Override public boolean rebalanceFinished(AffinityTopologyVersion topVer) { - assert false; + assert false : "Should not be called on non-affinity node"; return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/caaab6e5/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 2bc6869..1f2d7c5 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 @@ -431,6 +431,8 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda * @return {@code True} if there is no need to further search value. */ private boolean localGet(KeyCacheObject key, int part, Map<K, V> locVals) { + assert cctx.affinityNode() : this; + GridDhtCacheAdapter<K, V> cache = cache(); while (true) { http://git-wip-us.apache.org/repos/asf/ignite/blob/caaab6e5/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 12a1b74..9291001 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 @@ -548,7 +548,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap * @param key Key. * @param part Partition. * @param topVer Topology version. - * @param nearRead {@code True} if tried to read from near cache. + * @param nearRead {@code True} if already tried to read from near cache. * @return {@code True} if there is no need to further search value. */ private boolean localDhtGet(KeyCacheObject key, @@ -557,6 +557,8 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap boolean nearRead) { GridDhtCacheAdapter<K, V> dht = cache().dht(); + assert dht.context().affinityNode() : this; + while (true) { GridCacheEntryEx dhtEntry = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/caaab6e5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java index 7b1b6f1..ac80d69 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java @@ -326,7 +326,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst for (int i = 0; i < 100; i++) { cache.put(key, key); - assertEquals("Invalid value for node: " + ignite.name(), key, cache.get(key)); + assertEquals(key, cache.get(key)); key++; }
