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 2015/03/03 09:54:57 UTC
[27/50] incubator-ignite git commit: #ignite-237: fix
ClientAbstractMultiThreadedSelfTest.
#ignite-237: fix ClientAbstractMultiThreadedSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/120711b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/120711b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/120711b2
Branch: refs/heads/sprint-2
Commit: 120711b2f8e81634f11b762d3c8f7f0f8aafd18c
Parents: 31180aa
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 27 12:51:07 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 27 12:51:07 2015 +0300
----------------------------------------------------------------------
.../ClientAbstractMultiThreadedSelfTest.java | 34 +++-----------------
1 file changed, 5 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/120711b2/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index 4ab2679..079b3ec 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -426,19 +426,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
String key = String.valueOf(rawKey);
UUID nodeId = cache.affinity(key);
- UUID srvNodeId = ignite.cluster().mapKeyToNode(PARTITIONED_CACHE_NAME, key).id();
-
- if (!nodeId.equals(srvNodeId)) {
- //GridClientDataAffinity clAff =
- // ((GridClientConfiguration)getFieldValue(client, "cfg")).
- // getDataConfiguration(PARTITIONED_CACHE_NAME).getAffinity();
-
- //printAffinityState(gridMap.values());
- //info("Client affinity: " + clAff);
-
- info("Got wrong client mapping [key=" + key + ", exp=" + srvNodeId +
- ", actual=" + nodeId + "]");
- }
String val = "val" + rawKey;
@@ -475,25 +462,14 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
puts.get(key).get2(), gridMap.get(node.id()).jcache(PARTITIONED_CACHE_NAME).localPeek(key, CachePeekMode.ONHEAP));
}
- // Assert that client has properly determined affinity node.
- if (!node.id().equals(puts.get(key).get1())) {
- //GridClientDataAffinity clAff =
- // ((GridClientConfiguration)getFieldValue(client, "cfg")).
- // getDataConfiguration(PARTITIONED_CACHE_NAME).getAffinity();
- //printAffinityState(gridMap.values());
- //info("Client affinity: " + clAff);
-
- UUID curAffNode = client.data(PARTITIONED_CACHE_NAME).affinity(key);
-
- failNotEquals(
- "Got different mappings [key=" + key + ", currId=" + curAffNode + "]",
- node.id(), puts.get(key).get1());
- }
+ UUID curAffNode = client.data(PARTITIONED_CACHE_NAME).affinity(key);
// Check that no other nodes see this key.
- for (UUID id : F.view(gridMap.keySet(), F.notEqualTo(node.id())))
- assertNull("Got value in near cache.", gridMap.get(id).jcache(PARTITIONED_CACHE_NAME).localPeek(key, CachePeekMode.ONHEAP));
+ for (UUID id : gridMap.keySet()) {
+ if (!id.equals(curAffNode) && !id.equals(node.id()))
+ assertNull("Got value in near cache.", gridMap.get(id).jcache(PARTITIONED_CACHE_NAME).localPeek(key, CachePeekMode.ONHEAP));
+ }
}
for (Ignite g : gridMap.values())