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/07/06 15:40:03 UTC
[3/3] incubator-ignite git commit: # ignite-901 WIP
# ignite-901 WIP
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a2ed51a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a2ed51a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a2ed51a
Branch: refs/heads/ignite-901
Commit: 1a2ed51a4b108f28ca7ed998b70f7922ae9f6ac5
Parents: 308e9b7
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jul 6 16:39:47 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jul 6 16:39:47 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMvccManager.java | 2 +-
.../processors/task/GridTaskProcessor.java | 23 ++++++++--
.../IgniteClientReconnectAbstractTest.java | 29 ++++++------
.../IgniteClientReconnectApiBlockTest.java | 48 +++++++++++---------
.../IgniteClientReconnectAtomicsTest.java | 8 ++--
.../IgniteClientReconnectCollectionsTest.java | 4 +-
.../IgniteClientReconnectComputeTest.java | 6 +--
.../IgniteClientReconnectServicesTest.java | 4 +-
.../IgniteClientReconnectStreamerTest.java | 3 +-
.../IgniteClientReconnectQueriesTest.java | 24 +++++-----
10 files changed, 86 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2ed51a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index bc9a995..9ae2209 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -320,7 +320,7 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
/**
* @param reconnectFut Reconnect future.
- * @return Client disconnected exceprion.
+ * @return Client disconnected exception.
*/
private IgniteClientDisconnectedCheckedException disconnectedError(@Nullable IgniteFuture<?> reconnectFut) {
if (reconnectFut == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2ed51a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 22add73..65ce557 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -119,16 +119,25 @@ public class GridTaskProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@Override public void onDisconnected(IgniteFuture<?> reconnectFut) throws IgniteCheckedException {
- IgniteClientDisconnectedCheckedException err = new IgniteClientDisconnectedCheckedException(reconnectFut,
- "Client node disconnected.");
+ IgniteClientDisconnectedCheckedException err = disconnectedError(reconnectFut);
for (GridTaskWorker<?, ?> worker : tasks.values()) {
- worker.cancel();
-
worker.finishTask(null, err);
+
+ worker.cancel();
}
}
+ /**
+ * @param reconnectFut Reconnect future.
+ * @return Client disconnected exception.
+ */
+ private IgniteClientDisconnectedCheckedException disconnectedError(@Nullable IgniteFuture<?> reconnectFut) {
+ return new IgniteClientDisconnectedCheckedException(
+ reconnectFut != null ? reconnectFut : ctx.cluster().clientReconnectFuture(),
+ "Failed to execute task, client node disconnected.");
+ }
+
/** {@inheritDoc} */
@SuppressWarnings("TooBroadScope")
@Override public void onKernalStop(boolean cancel) {
@@ -627,6 +636,12 @@ public class GridTaskProcessor extends GridProcessorAdapter {
}
else
taskWorker.run();
+
+ if (ctx.clientDisconnected()) {
+ taskWorker.finishTask(null, disconnectedError(null));
+
+ taskWorker.cancel();
+ }
}
}
else {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2ed51a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
index 99dddf9..1367c9f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.spi.discovery.tcp.messages.*;
import org.apache.ignite.testframework.junits.common.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.io.*;
import java.net.*;
import java.util.concurrent.*;
@@ -213,27 +214,27 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra
/**
* @param e Client disconnected exception.
*/
- protected void checkAndWait(Exception e) {
+ protected void checkAndWait(CacheException e) {
log.info("Expected exception: " + e);
- if (e instanceof IgniteClientDisconnectedException){
- ((IgniteClientDisconnectedException)e).reconnectFuture().get();
+ assertTrue("Unexpected cause: " + e.getCause(), e.getCause() instanceof IgniteClientDisconnectedException);
- return;
- }
+ IgniteClientDisconnectedException e0 = (IgniteClientDisconnectedException)e.getCause();
+
+ assertNotNull(e0.reconnectFuture());
- IgniteClientDisconnectedException discException = X.cause(e, IgniteClientDisconnectedException.class);
+ e0.reconnectFuture().get();
+ }
- if (discException != null)
- discException.reconnectFuture().get();
+ /**
+ * @param e Client disconnected exception.
+ */
+ protected void checkAndWait(IgniteClientDisconnectedException e) {
+ log.info("Expected exception: " + e);
- IgniteClientDisconnectedCheckedException discCheckedException =
- X.cause(e, IgniteClientDisconnectedCheckedException.class);
+ assertNotNull(e.reconnectFuture());
- if (discCheckedException != null)
- discCheckedException.reconnectFuture().get();
- else
- fail("Unexpected exception: " + e);
+ e.reconnectFuture().get();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2ed51a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiBlockTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiBlockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiBlockTest.java
index e056641..624a2b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiBlockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiBlockTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.testframework.*;
+import javax.cache.*;
import javax.cache.processor.*;
import java.util.*;
import java.util.concurrent.*;
@@ -54,7 +55,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
/**
* @throws Exception If failed.
*/
- public void testIgniteBlockOnDisconnect() throws Exception {
+ public void testErrorOnDisconnect() throws Exception {
// Check cache operations.
cacheOperationsTest();
@@ -86,7 +87,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
client.atomicLong("testAtomic", 41, true);
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -118,7 +119,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
client.set("testSet", new CollectionConfiguration());
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -155,7 +156,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
client.queue("TestQueue", 10, new CollectionConfiguration());
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -210,7 +211,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
defaultCache.getAndPut(9999, 9999);
}
- catch (Exception e) {
+ catch (CacheException e) {
failed = true;
checkAndWait(e);
@@ -240,7 +241,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
defaultCache.put(10000, 10000);
}
- catch (Exception e) {
+ catch (CacheException e) {
failed = true;
checkAndWait(e);
@@ -272,7 +273,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
defaultCache.get(10001);
}
- catch (Exception e) {
+ catch (CacheException e) {
failed = true;
checkAndWait(e);
@@ -307,7 +308,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
}
});
}
- catch (Exception e) {
+ catch (CacheException e) {
failed = true;
checkAndWait(e);
@@ -348,7 +349,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
async.future().get();
}
- catch (Exception e) {
+ catch (CacheException e) {
failed = true;
checkAndWait(e);
@@ -380,7 +381,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
client.transactions();
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -410,7 +411,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
client.cache(null);
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -444,7 +445,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
client.dataStreamer(null);
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -478,7 +479,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
client.createCache("test_cache");
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -518,11 +519,11 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
final Ignite client = startGrid(serverCount());
- final IgniteCache<Object, Object> defaultCache = client.cache(null);
+ final IgniteCache<Object, Object> dfltCache = client.cache(null);
final CountDownLatch recvLatch = new CountDownLatch(1);
- assertNotNull(defaultCache);
+ assertNotNull(dfltCache);
doTestIgniteOperationOnDisconnect(client, Arrays.asList(
// Check compute.
@@ -534,7 +535,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
client.compute();
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -558,6 +559,8 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
}
});
+ assertFalse(uuids.isEmpty());
+
for (UUID uuid : uuids)
assertNotNull(uuid);
@@ -575,7 +578,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
try {
client.cluster().pingNode(new UUID(0, 0));
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -609,7 +612,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
}
});
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -652,7 +655,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
}
});
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -679,7 +682,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
msg.send(null, "Test message.");
try {
- assert recvLatch.await(2, TimeUnit.SECONDS);
+ assertTrue(recvLatch.await(2, TimeUnit.SECONDS));
}
catch (InterruptedException e) {
fail("Message wasn't received.");
@@ -702,7 +705,7 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
}
});
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
failed = true;
checkAndWait(e);
@@ -740,7 +743,8 @@ public class IgniteClientReconnectApiBlockTest extends IgniteClientReconnectAbst
}
/**
- *
+ * @param client Client.
+ * @param ops Operations closures.
* @throws Exception If failed.
*/
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2ed51a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java
index 91311ef..d9afe33 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java
@@ -146,7 +146,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr
try {
clientAtomicSeq.incrementAndGet();
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
@@ -305,7 +305,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr
try {
clientAtomicRef.compareAndSet("3st value", "4st value");
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
@@ -465,7 +465,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr
try {
clientAtomicStamped.compareAndSet(2, 3, 2, 3);
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
@@ -597,7 +597,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr
try {
clientAtomicLong.getAndAdd(1);
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2ed51a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java
index f24a8ae..bba9655 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java
@@ -270,7 +270,7 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA
for (int i = 0; i < 100; i++)
clientSet.add("2");
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
@@ -411,7 +411,7 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA
try {
clientQueue.add("2");
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2ed51a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java
index 212fdc1..cff3b5c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java
@@ -66,7 +66,7 @@ public class IgniteClientReconnectComputeTest extends IgniteClientReconnectAbstr
}
});
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
@@ -115,7 +115,7 @@ public class IgniteClientReconnectComputeTest extends IgniteClientReconnectAbstr
}
});
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
@@ -164,7 +164,7 @@ public class IgniteClientReconnectComputeTest extends IgniteClientReconnectAbstr
}
}, Arrays.asList(1, 2, 3));
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2ed51a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java
index 681efa4..58715a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java
@@ -136,7 +136,7 @@ public class IgniteClientReconnectServicesTest extends IgniteClientReconnectAbst
try {
services.deployClusterSingleton("testReconnectInDeploying", new TestServiceImpl());
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
@@ -189,7 +189,7 @@ public class IgniteClientReconnectServicesTest extends IgniteClientReconnectAbst
try {
srvc.test();
}
- catch (Exception e) {
+ catch (IgniteClientDisconnectedException e) {
checkAndWait(e);
return true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2ed51a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
index 8112ce5..e85c315 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.internal.processors.datastreamer.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.testframework.*;
+import javax.cache.*;
import java.util.concurrent.*;
/**
@@ -126,7 +127,7 @@ public class IgniteClientReconnectStreamerTest extends IgniteClientReconnectAbst
streamer.flush();
}
- catch (Exception e) {
+ catch (CacheException e) {
checkAndWait(e);
return true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2ed51a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/IgniteClientReconnectQueriesTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/IgniteClientReconnectQueriesTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/IgniteClientReconnectQueriesTest.java
index f75e780..303b892 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/IgniteClientReconnectQueriesTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/IgniteClientReconnectQueriesTest.java
@@ -87,7 +87,7 @@ public class IgniteClientReconnectQueriesTest extends IgniteClientReconnectAbstr
SqlQuery<Integer, Person> qry = new SqlQuery<>(Person.class, "_key<>0");
qry.setPageSize(1);
- QueryCursor<Cache.Entry<Integer, Person>> queryCursor = clnCache.query(qry);
+ QueryCursor<Cache.Entry<Integer, Person>> qryCursor = clnCache.query(qry);
reconnectClientNode(cln, srv, new Runnable() {
@Override public void run() {
@@ -95,10 +95,10 @@ public class IgniteClientReconnectQueriesTest extends IgniteClientReconnectAbstr
}
});
- List<Cache.Entry<Integer, Person>> result = queryCursor.getAll();
+ List<Cache.Entry<Integer, Person>> res = qryCursor.getAll();
- assertNotNull(result);
- assertEquals(4, result.size());
+ assertNotNull(res);
+ assertEquals(4, res.size());
}
/**
@@ -122,7 +122,7 @@ public class IgniteClientReconnectQueriesTest extends IgniteClientReconnectAbstr
final SqlQuery<Integer, Person> qry = new SqlQuery<>(Person.class, "_key<>0");
qry.setPageSize(1);
- final QueryCursor<Cache.Entry<Integer, Person>> queryCursor = clnCache.query(qry);
+ final QueryCursor<Cache.Entry<Integer, Person>> qryCursor = clnCache.query(qry);
BlockTpcCommunicationSpi commSpi = commSpi(srv);
@@ -131,7 +131,7 @@ public class IgniteClientReconnectQueriesTest extends IgniteClientReconnectAbstr
final IgniteInternalFuture<Object> fut = GridTestUtils.runAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
try {
- queryCursor.getAll();
+ qryCursor.getAll();
}
catch (Exception e) {
checkAndWait(e);
@@ -187,7 +187,7 @@ public class IgniteClientReconnectQueriesTest extends IgniteClientReconnectAbstr
}
});
- final QueryCursor<Cache.Entry<Integer, Person>> queryCursor = clnCache.query(scanQry);
+ final QueryCursor<Cache.Entry<Integer, Person>> qryCursor = clnCache.query(scanQry);
reconnectClientNode(cln, srv, new Runnable() {
@Override public void run() {
@@ -198,13 +198,13 @@ public class IgniteClientReconnectQueriesTest extends IgniteClientReconnectAbstr
IgniteInternalFuture<List<Cache.Entry<Integer, Person>>> f = GridTestUtils
.runAsync(new Callable<List<Cache.Entry<Integer, Person>>>() {
@Override public List<Cache.Entry<Integer, Person>> call() throws Exception {
- return queryCursor.getAll();
+ return qryCursor.getAll();
}
});
- List<Cache.Entry<Integer, Person>> result = f.get(2, TimeUnit.SECONDS);
+ List<Cache.Entry<Integer, Person>> res = f.get(2, TimeUnit.SECONDS);
- assertEquals(4, result.size());
+ assertEquals(4, res.size());
}
/**
@@ -232,7 +232,7 @@ public class IgniteClientReconnectQueriesTest extends IgniteClientReconnectAbstr
}
});
- final QueryCursor<Cache.Entry<Integer, Person>> queryCursor = clnCache.query(scanQry);
+ final QueryCursor<Cache.Entry<Integer, Person>> qryCursor = clnCache.query(scanQry);
BlockTpcCommunicationSpi commSpi = commSpi(srv);
@@ -241,7 +241,7 @@ public class IgniteClientReconnectQueriesTest extends IgniteClientReconnectAbstr
final IgniteInternalFuture<Object> fut = GridTestUtils.runAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
try {
- queryCursor.getAll();
+ qryCursor.getAll();
}
catch (Exception e) {
checkAndWait(e);