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 2014/12/12 10:29:08 UTC
[07/67] [abbrv] [partial] incubator-ignite git commit: Rename
GridException to IgniteCheckedException,
GridRuntimeException to IgniteException.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/util/nio/GridNioSslSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/nio/GridNioSslSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/nio/GridNioSslSelfTest.java
index 63696d1..fe58e22 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/nio/GridNioSslSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/nio/GridNioSslSelfTest.java
@@ -8,9 +8,9 @@
*/
package org.gridgain.grid.util.nio;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.internal.*;
+import org.apache.ignite.*;
import org.gridgain.grid.util.nio.ssl.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.*;
import javax.net.ssl.*;
@@ -30,12 +30,12 @@ public class GridNioSslSelfTest extends GridNioSelfTest {
}
/** {@inheritDoc} */
- @Override protected Socket createSocket() throws GridException {
+ @Override protected Socket createSocket() throws IgniteCheckedException {
try {
return sslCtx.getSocketFactory().createSocket();
}
catch (Exception e) {
- throw new GridException(e);
+ throw new IgniteCheckedException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/util/nio/impl/GridNioFilterChainSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/nio/impl/GridNioFilterChainSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/nio/impl/GridNioFilterChainSelfTest.java
index 47d5492..cd939d9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/nio/impl/GridNioFilterChainSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/nio/impl/GridNioFilterChainSelfTest.java
@@ -9,7 +9,7 @@
package org.gridgain.grid.util.nio.impl;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.util.lang.*;
import org.gridgain.grid.util.nio.*;
import org.gridgain.testframework.junits.common.*;
@@ -88,15 +88,15 @@ public class GridNioFilterChainSelfTest extends GridCommonAbstractTest {
};
GridNioFilterAdapter testHead = new GridNioFilterAdapter("TestHead") {
- @Override public void onSessionOpened(GridNioSession ses) throws GridException {
+ @Override public void onSessionOpened(GridNioSession ses) throws IgniteCheckedException {
proceedSessionOpened(ses);
}
- @Override public void onSessionClosed(GridNioSession ses) throws GridException {
+ @Override public void onSessionClosed(GridNioSession ses) throws IgniteCheckedException {
proceedSessionClosed(ses);
}
- @Override public void onExceptionCaught(GridNioSession ses, GridException ex) throws GridException {
+ @Override public void onExceptionCaught(GridNioSession ses, IgniteCheckedException ex) throws IgniteCheckedException {
proceedExceptionCaught(ses, ex);
}
@@ -108,7 +108,7 @@ public class GridNioFilterChainSelfTest extends GridCommonAbstractTest {
return null;
}
- @Override public void onMessageReceived(GridNioSession ses, Object msg) throws GridException {
+ @Override public void onMessageReceived(GridNioSession ses, Object msg) throws IgniteCheckedException {
proceedMessageReceived(ses, msg);
}
@@ -118,11 +118,11 @@ public class GridNioFilterChainSelfTest extends GridCommonAbstractTest {
return null;
}
- @Override public void onSessionIdleTimeout(GridNioSession ses) throws GridException {
+ @Override public void onSessionIdleTimeout(GridNioSession ses) throws IgniteCheckedException {
proceedSessionIdleTimeout(ses);
}
- @Override public void onSessionWriteTimeout(GridNioSession ses) throws GridException {
+ @Override public void onSessionWriteTimeout(GridNioSession ses) throws IgniteCheckedException {
proceedSessionWriteTimeout(ses);
}
};
@@ -175,56 +175,56 @@ public class GridNioFilterChainSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void onSessionOpened(GridNioSession ses) throws GridException {
+ @Override public void onSessionOpened(GridNioSession ses) throws IgniteCheckedException {
chainMeta(ses, OPENED_META_NAME);
proceedSessionOpened(ses);
}
/** {@inheritDoc} */
- @Override public void onSessionClosed(GridNioSession ses) throws GridException {
+ @Override public void onSessionClosed(GridNioSession ses) throws IgniteCheckedException {
chainMeta(ses, CLOSED_META_NAME);
proceedSessionClosed(ses);
}
/** {@inheritDoc} */
- @Override public void onExceptionCaught(GridNioSession ses, GridException ex) throws GridException {
+ @Override public void onExceptionCaught(GridNioSession ses, IgniteCheckedException ex) throws IgniteCheckedException {
chainMeta(ses, EXCEPTION_CAUGHT_META_NAME);
proceedExceptionCaught(ses, ex);
}
/** {@inheritDoc} */
- @Override public GridNioFuture<?> onSessionWrite(GridNioSession ses, Object msg) throws GridException {
+ @Override public GridNioFuture<?> onSessionWrite(GridNioSession ses, Object msg) throws IgniteCheckedException {
chainMeta(ses, MESSAGE_WRITE_META_NAME);
return proceedSessionWrite(ses, msg);
}
/** {@inheritDoc} */
- @Override public void onMessageReceived(GridNioSession ses, Object msg) throws GridException {
+ @Override public void onMessageReceived(GridNioSession ses, Object msg) throws IgniteCheckedException {
chainMeta(ses, MESSAGE_RECEIVED_META_NAME);
proceedMessageReceived(ses, msg);
}
/** {@inheritDoc} */
- @Override public GridNioFuture<Boolean> onSessionClose(GridNioSession ses) throws GridException {
+ @Override public GridNioFuture<Boolean> onSessionClose(GridNioSession ses) throws IgniteCheckedException {
chainMeta(ses, CLOSE_META_NAME);
return proceedSessionClose(ses);
}
/** {@inheritDoc} */
- @Override public void onSessionIdleTimeout(GridNioSession ses) throws GridException {
+ @Override public void onSessionIdleTimeout(GridNioSession ses) throws IgniteCheckedException {
chainMeta(ses, IDLE_META_NAME);
proceedSessionIdleTimeout(ses);
}
/** {@inheritDoc} */
- @Override public void onSessionWriteTimeout(GridNioSession ses) throws GridException {
+ @Override public void onSessionWriteTimeout(GridNioSession ses) throws IgniteCheckedException {
chainMeta(ses, WRITE_TIMEOUT_META_NAME);
proceedSessionWriteTimeout(ses);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java
index d1c3c93..1833414 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java
@@ -9,13 +9,12 @@
package org.gridgain.grid.util.offheap;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.GridException;
-import org.apache.ignite.lang.IgniteFuture;
import org.gridgain.grid.util.lang.*;
-import org.gridgain.grid.util.typedef.X;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.offheap.unsafe.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
import org.jdk8.backport.*;
@@ -669,7 +668,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT
it.close();
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
catch (InterruptedException e) {
@@ -741,7 +740,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT
IgniteFuture<?> fut = multithreadedAsync(new Callable<Void>() {
@Override
- public Void call() throws GridException {
+ public Void call() throws IgniteCheckedException {
Random rnd = new Random();
while (!stop.get()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
index ea747bc..6f8e63c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.util.offheap;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.util.lang.*;
@@ -605,7 +605,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm
}
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
fail("Unexpected exception caught: " + e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheLoadPopulationTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheLoadPopulationTask.java b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheLoadPopulationTask.java
index e5dd69e..36ea22b 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheLoadPopulationTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheLoadPopulationTask.java
@@ -25,12 +25,12 @@ public class GridCacheLoadPopulationTask extends ComputeTaskSplitAdapter<Void, V
private static final long serialVersionUID = 1L;
/** {@inheritDoc} */
- @Override public Void reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
return null;
}
/** {@inheritDoc} */
- @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) throws GridException {
+ @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) throws IgniteCheckedException {
Collection<ChunkPopulationJob> jobs = new ArrayList<>();
int maxElements = 10000;
@@ -75,7 +75,7 @@ public class GridCacheLoadPopulationTask extends ComputeTaskSplitAdapter<Void, V
/** {@inheritDoc} */
@SuppressWarnings({"unchecked", "ConstantConditions"})
- @Override public Object execute() throws GridException {
+ @Override public Object execute() throws IgniteCheckedException {
Map<Object, TestValue> map = new TreeMap<>();
for (int i = startElementIdx; i < startElementIdx + maxElements; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
index 427cc9f..256c896 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
@@ -234,9 +234,9 @@ abstract class GridCacheAbstractLoadTest {
*
* @param log Log file name.
* @return Logger.
- * @throws GridException If file initialization failed.
+ * @throws IgniteCheckedException If file initialization failed.
*/
- protected IgniteLogger initLogger(String log) throws GridException {
+ protected IgniteLogger initLogger(String log) throws IgniteCheckedException {
Logger impl = Logger.getRootLogger();
impl.removeAllAppenders();
@@ -259,7 +259,7 @@ abstract class GridCacheAbstractLoadTest {
fileApp.activateOptions();
}
catch (IOException e) {
- throw new GridException("Unable to initialize file appender.", e);
+ throw new IgniteCheckedException("Unable to initialize file appender.", e);
}
LevelRangeFilter lvlFilter = new LevelRangeFilter();
@@ -307,18 +307,18 @@ abstract class GridCacheAbstractLoadTest {
* @param springCfgPath Configuration file path.
* @param log Log file name.
* @return Configuration.
- * @throws GridException If fails.
+ * @throws IgniteCheckedException If fails.
*/
@SuppressWarnings("unchecked")
- protected IgniteConfiguration configuration(String springCfgPath, String log) throws GridException {
+ protected IgniteConfiguration configuration(String springCfgPath, String log) throws IgniteCheckedException {
File path = GridTestUtils.resolveGridGainPath(springCfgPath);
if (path == null)
- throw new GridException("Spring XML configuration file path is invalid: " + new File(springCfgPath) +
+ throw new IgniteCheckedException("Spring XML configuration file path is invalid: " + new File(springCfgPath) +
". Note that this path should be either absolute path or a relative path to GRIDGAIN_HOME.");
if (!path.isFile())
- throw new GridException("Provided file path is not a file: " + path);
+ throw new IgniteCheckedException("Provided file path is not a file: " + path);
// Add no-op logger to remove no-appender warning.
Appender app = new NullAppender();
@@ -331,7 +331,7 @@ abstract class GridCacheAbstractLoadTest {
springCtx = new FileSystemXmlApplicationContext(path.toURI().toURL().toString());
}
catch (BeansException | MalformedURLException e) {
- throw new GridException("Failed to instantiate Spring XML application context: " + e.getMessage(), e);
+ throw new IgniteCheckedException("Failed to instantiate Spring XML application context: " + e.getMessage(), e);
}
Map cfgMap;
@@ -341,20 +341,20 @@ abstract class GridCacheAbstractLoadTest {
cfgMap = springCtx.getBeansOfType(IgniteConfiguration.class);
}
catch (BeansException e) {
- throw new GridException("Failed to instantiate bean [type=" + IgniteConfiguration.class + ", err=" +
+ throw new IgniteCheckedException("Failed to instantiate bean [type=" + IgniteConfiguration.class + ", err=" +
e.getMessage() + ']', e);
}
if (cfgMap == null)
- throw new GridException("Failed to find a single grid factory configuration in: " + path);
+ throw new IgniteCheckedException("Failed to find a single grid factory configuration in: " + path);
// Remove previously added no-op logger.
Logger.getRootLogger().removeAppender(app);
if (cfgMap.isEmpty())
- throw new GridException("Can't find grid factory configuration in: " + path);
+ throw new IgniteCheckedException("Can't find grid factory configuration in: " + path);
else if (cfgMap.size() > 1)
- throw new GridException("More than one configuration provided for cache load test: " + cfgMap.values());
+ throw new IgniteCheckedException("More than one configuration provided for cache load test: " + cfgMap.values());
IgniteConfiguration cfg = (IgniteConfiguration)cfgMap.values().iterator().next();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
index 7ce43ce..e408f66 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
@@ -152,9 +152,9 @@ public class GridCacheAffinityTransactionsOffHeapTest {
}
/**
- * @throws GridException In case of error.
+ * @throws IgniteCheckedException In case of error.
*/
- private static void startNodes() throws GridException {
+ private static void startNodes() throws IgniteCheckedException {
for (int i = 0; i < NODE_CNT; i++)
Ignition.start(getConfiguration("grid-" + i));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java
index 0c1d5c8..beaf6f2 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java
@@ -72,7 +72,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> longWriteClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheAtomicLong al = cache.cache().dataStructures().atomicLong(TEST_LONG_NAME, 0, true);
for (int i = 0; i < operationsPerTx; i++) {
@@ -90,7 +90,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> longReadClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheAtomicLong al = cache.cache().dataStructures().atomicLong(TEST_LONG_NAME, 0, true);
for (int i = 0; i < operationsPerTx; i++) {
@@ -108,7 +108,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> refWriteClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheAtomicReference<Integer> ar = cache.cache().dataStructures().atomicReference(TEST_REF_NAME,
null, true);
@@ -127,7 +127,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> refReadClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheAtomicReference<Integer> ar = cache.cache().dataStructures().atomicReference(TEST_REF_NAME, null,
true);
@@ -146,7 +146,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> seqWriteClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheAtomicSequence as = cache.cache().dataStructures().atomicSequence(TEST_SEQ_NAME, 0, true);
for (int i = 0; i < operationsPerTx; i++) {
@@ -164,7 +164,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> seqReadClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheAtomicSequence as = cache.cache().dataStructures().atomicSequence(TEST_SEQ_NAME, 0, true);
for (int i = 0; i < operationsPerTx; i++) {
@@ -182,7 +182,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> stampWriteClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheAtomicStamped<Integer, Integer> as = cache.cache().dataStructures().atomicStamped(TEST_STAMP_NAME,
0, 0, true);
@@ -201,7 +201,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> stampReadClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheAtomicStamped<Integer, Integer> as = cache.cache().dataStructures().atomicStamped(TEST_STAMP_NAME,
0, 0, true);
@@ -220,7 +220,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> queueWriteClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheQueue<Integer> q = cache.cache().dataStructures().queue(TEST_QUEUE_NAME, 0, true, true);
for (int i = 0; i < operationsPerTx; i++) {
@@ -238,7 +238,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> queueReadClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheQueue<Integer> q = cache.cache().dataStructures().queue(TEST_QUEUE_NAME, 0, true, true);
for (int i = 0; i < operationsPerTx; i++) {
@@ -256,7 +256,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> latchWriteClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheCountDownLatch l = cache.cache().dataStructures().countDownLatch(TEST_LATCH_NAME, LATCH_INIT_CNT,
true, true);
@@ -275,7 +275,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
private final CIX1<GridCacheProjection<Integer, Integer>> latchReadClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
GridCacheCountDownLatch l = cache.cache().dataStructures().countDownLatch(TEST_LATCH_NAME, LATCH_INIT_CNT,
true, true);
@@ -292,9 +292,9 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
/**
* @param args Arguments.
- * @throws GridException In case of error.
+ * @throws IgniteCheckedException In case of error.
*/
- public static void main(String[] args) throws GridException {
+ public static void main(String[] args) throws IgniteCheckedException {
System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
System.out.println("Starting master node [params=" + Arrays.toString(args) + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
index bbae6bd..097ad13 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
@@ -41,7 +41,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
private final CIX1<GridCacheProjection<Integer, Integer>> writeClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
for (int i = 0; i < operationsPerTx; i++) {
int kv = RAND.nextInt(KEY_RANGE);
@@ -59,7 +59,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
private final CIX1<GridCacheProjection<Integer, Integer>> readClos =
new CIX1<GridCacheProjection<Integer, Integer>>() {
@Override public void applyx(GridCacheProjection<Integer, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
for (int i = 0; i < operationsPerTx; i++) {
int k = RAND.nextInt(KEY_RANGE);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java
index 97ef145..9a4aa47 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java
@@ -80,9 +80,9 @@ public class GridCacheSwapLoadTest {
/**
* @param args Command line arguments.
- * @throws GridException In case of error.
+ * @throws IgniteCheckedException In case of error.
*/
- public static void main(String[] args) throws GridException {
+ public static void main(String[] args) throws IgniteCheckedException {
parseArgs(args);
try (Ignite g = G.start("modules/core/src/test/config/spring-cache-swap.xml")) {
@@ -194,7 +194,7 @@ public class GridCacheSwapLoadTest {
final AtomicInteger putKey = new AtomicInteger(0);
return GridTestUtils.runMultiThreadedAsync(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
GridCache<Integer, Integer> cache = g.cache(null);
assert cache != null;
@@ -295,7 +295,7 @@ public class GridCacheSwapLoadTest {
*/
private static void wait(Iterable<IgniteFuture<?>> futs) {
F.forEach(futs, new CIX1<IgniteFuture<?>>() {
- @Override public void applyx(IgniteFuture<?> fut) throws GridException {
+ @Override public void applyx(IgniteFuture<?> fut) throws IgniteCheckedException {
fut.get();
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
index ee984db..89b871c 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
@@ -9,13 +9,13 @@
package org.gridgain.loadtests.cache;
+import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.store.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.gridgain.grid.cache.*;
+import org.gridgain.grid.cache.store.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
import org.jetbrains.annotations.*;
@@ -161,7 +161,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest {
cache.put(key, "val" + key);
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
error("Unexpected exception in put thread", e);
assert false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
index ef6e897..1a20e41 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
@@ -34,10 +34,10 @@ public class GridTestCacheStore extends GridCacheStoreAdapter<GridTestKey, Long>
*
* @param clo Callback for every key.
* @param args Optional arguments.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@Override public void loadCache(final IgniteBiInClosure<GridTestKey, Long> clo,
- Object... args) throws GridException {
+ Object... args) throws IgniteCheckedException {
// Number of threads is passed in as argument by caller.
final int numThreads = (Integer)args[0];
int entryCnt = (Integer)args[1];
@@ -96,7 +96,7 @@ public class GridTestCacheStore extends GridCacheStoreAdapter<GridTestKey, Long>
completeSvc.take().get();
}
catch (InterruptedException | ExecutionException e) {
- throw new GridException(e);
+ throw new IgniteCheckedException(e);
}
}
@@ -108,15 +108,15 @@ public class GridTestCacheStore extends GridCacheStoreAdapter<GridTestKey, Long>
}
}
- @Override public Long load(GridCacheTx tx, GridTestKey key) throws GridException {
+ @Override public Long load(GridCacheTx tx, GridTestKey key) throws IgniteCheckedException {
return null; // No-op.
}
- @Override public void put(GridCacheTx tx, GridTestKey key, Long val) throws GridException {
+ @Override public void put(GridCacheTx tx, GridTestKey key, Long val) throws IgniteCheckedException {
// No-op.
}
- @Override public void remove(GridCacheTx tx, GridTestKey key) throws GridException {
+ @Override public void remove(GridCacheTx tx, GridTestKey key) throws IgniteCheckedException {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java
index 6423cbe..6c39289 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java
@@ -22,7 +22,7 @@ public class GridTestLifecycleBean implements LifecycleBean {
@IgniteInstanceResource
private Ignite g;
- @Override public void onLifecycleEvent(LifecycleEventType type) throws GridException {
+ @Override public void onLifecycleEvent(LifecycleEventType type) throws IgniteCheckedException {
if (type == LifecycleEventType.AFTER_GRID_START) {
GridCache<GridTestKey, Long> cache = g.cache("partitioned");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java
index 60eb306..091f3fb 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java
@@ -29,7 +29,7 @@ public class GridTestMain {
* Main method.
*
* @param args Parameters.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
public static void main(String[] args) throws Exception {
BeanFactory ctx = new ClassPathXmlApplicationContext("org/gridgain/loadtests/colocation/spring-colocation.xml");
@@ -155,9 +155,9 @@ public class GridTestMain {
* {@link GridTestCacheStore#loadAll} method.
*
* @param cache Cache to load.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private static void loadFromStore(GridCache<GridTestKey, Long> cache) throws GridException {
+ private static void loadFromStore(GridCache<GridTestKey, Long> cache) throws IgniteCheckedException {
cache.loadCache(null, 0, GridTestConstants.LOAD_THREADS, GridTestConstants.ENTRY_COUNT);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark.java
index 637a2e8..8d82c98 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark.java
@@ -9,6 +9,7 @@
package org.gridgain.loadtests.communication;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.*;
@@ -89,9 +90,9 @@ public class GridIoManagerBenchmark {
/**
* @param args Command line arguments.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public static void main(String[] args) throws GridException {
+ public static void main(String[] args) throws IgniteCheckedException {
int threads = args.length > 0 ? Integer.parseInt(args[0]) : DFLT_THREADS;
int duration = args.length > 1 ? Integer.parseInt(args[1]) : 0;
String outputFilename = args.length > 2 ? args[2] : null;
@@ -232,7 +233,7 @@ public class GridIoManagerBenchmark {
try {
io.send(node, TEST_TOPIC, testMsg, PUBLIC_POOL);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
}
@@ -284,7 +285,7 @@ public class GridIoManagerBenchmark {
throw new RuntimeException("Failed to await latch.");
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
catch (InterruptedException ignored) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java
index 6153da0..84be76e 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java
@@ -9,6 +9,7 @@
package org.gridgain.loadtests.communication;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
@@ -117,7 +118,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest {
try {
rcv.send(sndNode, topic, (GridTcpCommunicationMessageAdapter)msg, PUBLIC_POOL);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
error("Failed to send message.", e);
}
}
@@ -162,7 +163,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest {
snd.send(rcvNode, topic, new GridTestMessage(msgId, (String)null), PUBLIC_POOL);
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
X.println("Message send failed", e);
}
catch (InterruptedException ignored) {
@@ -211,7 +212,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest {
try {
rcv.send(sndNode, topic, (GridTcpCommunicationMessageAdapter)msg, PUBLIC_POOL);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
error("Failed to send message.", e);
}
}
@@ -260,7 +261,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest {
msgCntr.increment();
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
X.println("Message send failed", e);
}
catch (InterruptedException ignored) {
@@ -311,7 +312,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest {
try {
rcv.send(sndNode, topic, (GridTcpCommunicationMessageAdapter)msg, PUBLIC_POOL);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
error("Failed to send message.", e);
}
}
@@ -381,7 +382,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest {
}
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
X.println("Message send failed", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridTcpCommunicationBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridTcpCommunicationBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridTcpCommunicationBenchmark.java
index e4f6d26..deb5bbb 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridTcpCommunicationBenchmark.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridTcpCommunicationBenchmark.java
@@ -212,7 +212,7 @@
// sndComm.sendMessage(rcvNode, buf, 0, len);
// }
// }
-// catch (GridException e) {
+// catch (IgniteCheckedException e) {
// X.println("Message send failed", e);
// }
// catch (InterruptedException ignored) {
@@ -283,7 +283,7 @@
//
// map.get(testMsg.id()).countDown();
// }
-// catch (GridException e) {
+// catch (IgniteCheckedException e) {
// U.error(log, "Failed to ", e);
// }
// finally {
@@ -341,7 +341,7 @@
// msgCntr.increment();
// }
// }
-// catch (GridException e) {
+// catch (IgniteCheckedException e) {
// X.println("Message send failed", e);
// }
// catch (InterruptedException ignored) {
@@ -415,7 +415,7 @@
// try {
// msg = getTestResources().getMarshaller().unmarshal(buf, U.gridClassLoader());
// }
-// catch (GridException e) {
+// catch (IgniteCheckedException e) {
// U.error(log, "Failed to unmarshal message.", e);
//
// fail();
@@ -492,7 +492,7 @@
// }
// }
// }
-// catch (GridException e) {
+// catch (IgniteCheckedException e) {
// X.println("Message send failed", e);
// }
//
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java
index 91f8986..3918e76 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java
@@ -74,14 +74,14 @@ public class GridContinuousOperationsLoadTest {
final GridCache<Object, Object> cache = ignite.cache(cacheName);
if (cache == null)
- throw new GridException("Cache is not configured: " + cacheName);
+ throw new IgniteCheckedException("Cache is not configured: " + cacheName);
// Continuous query manager, used to monitor queue size.
final GridCacheContinuousQueryManager contQryMgr =
((GridCacheAdapter)((GridCacheProxyImpl)cache).cache()).context().continuousQueries();
if (contQryMgr == null)
- throw new GridException("Could not access GridCacheContinuousQueryManager");
+ throw new IgniteCheckedException("Could not access GridCacheContinuousQueryManager");
final AtomicBoolean stop = new AtomicBoolean(); // Stop flag.
final AtomicLong cbCntr = new AtomicLong(); // Callback counter.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestJob.java
index 78bda2c..a29c0a2 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestJob.java
@@ -34,7 +34,7 @@ public class GridLoadTestJob extends ComputeJobAdapter {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override public Serializable execute() throws GridException {
+ @Override public Serializable execute() throws IgniteCheckedException {
Integer i = this.<Integer>argument(0);
assert i != null && i > 0;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestTask.java
index b438a77..cade932 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestTask.java
@@ -31,7 +31,7 @@ public class GridLoadTestTask extends ComputeTaskAdapter<Integer, Integer> {
private Ignite ignite;
/** {@inheritDoc} */
- @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws GridException {
+ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteCheckedException {
assert arg != null;
assert arg > 1;
@@ -59,7 +59,7 @@ public class GridLoadTestTask extends ComputeTaskAdapter<Integer, Integer> {
}
/** {@inheritDoc} */
- @Override public Integer reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
assert results != null;
int retVal = 0;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
index bb2cc04..0276456 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
@@ -124,7 +124,7 @@ public class GridMultiSplitsLoadTest extends GridCommonAbstractTest {
if (taskCnt % 500 == 0)
info(stats.toString());
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
error("Failed to execute grid task.", e);
fail();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
index fcf935f..1e473f7 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
@@ -110,7 +110,7 @@ public class GridMultiSplitsRedeployLoadTest extends GridCommonAbstractTest {
try {
deployTask(ignite);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
error("Failed to deploy grid task.", e);
fail();
@@ -120,7 +120,7 @@ public class GridMultiSplitsRedeployLoadTest extends GridCommonAbstractTest {
if (taskCnt % 500 == 0)
info(stats.toString());
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
error("Failed to execute grid task.", e);
fail();
@@ -134,10 +134,10 @@ public class GridMultiSplitsRedeployLoadTest extends GridCommonAbstractTest {
/**
* @param ignite Grid.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("unchecked")
- private void deployTask(Ignite ignite) throws GridException {
+ private void deployTask(Ignite ignite) throws IgniteCheckedException {
ignite.compute().localDeployTask(GridLoadTestTask.class, GridLoadTestTask.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestJobTarget.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestJobTarget.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestJobTarget.java
index 1ed133a..666cbc2 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestJobTarget.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestJobTarget.java
@@ -9,8 +9,8 @@
package org.gridgain.loadtests.direct.newnodes;
+import org.apache.ignite.*;
import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
/**
* Single split on new nodes test job target.
@@ -20,10 +20,10 @@ public class GridSingleSplitNewNodesTestJobTarget {
* @param level Level.
* @param jobSes Job session.
* @return Always returns {@code 1}.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("unused")
- public int executeLoadTestJob(int level, ComputeTaskSession jobSes) throws GridException {
+ public int executeLoadTestJob(int level, ComputeTaskSession jobSes) throws IgniteCheckedException {
assert level > 0;
assert jobSes != null;
@@ -34,7 +34,7 @@ public class GridSingleSplitNewNodesTestJobTarget {
}
catch (InterruptedException e) {
// Fail.
- throw new GridException("Failed to wait for attribute.", e);
+ throw new IgniteCheckedException("Failed to wait for attribute.", e);
}
return 1;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
index 86c6c04..570f59f 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
@@ -9,10 +9,10 @@
package org.gridgain.loadtests.direct.newnodes;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
import java.io.*;
import java.util.*;
@@ -30,7 +30,7 @@ public class GridSingleSplitNewNodesTestTask extends ComputeTaskAdapter<Integer,
private ComputeLoadBalancer balancer;
/** {@inheritDoc} */
- @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws GridException {
+ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteCheckedException {
assert !subgrid.isEmpty() : "Subgrid cannot be empty.";
Map<ComputeJobAdapter, ClusterNode> jobs = new HashMap<>(subgrid.size());
@@ -47,7 +47,7 @@ public class GridSingleSplitNewNodesTestTask extends ComputeTaskAdapter<Integer,
private ComputeTaskSession jobSes;
/** {@inheritDoc} */
- @Override public Serializable execute() throws GridException {
+ @Override public Serializable execute() throws IgniteCheckedException {
assert jobSes != null;
Integer arg = this.<Integer>argument(0);
@@ -73,7 +73,7 @@ public class GridSingleSplitNewNodesTestTask extends ComputeTaskAdapter<Integer,
}
/** {@inheritDoc} */
- @Override public Integer reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
int retVal = 0;
for (ComputeJobResult res : results) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
index 32c0f39..fce9b85 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
@@ -145,7 +145,7 @@ public class GridSingleSplitsRedeployLoadTest extends GridCommonAbstractTest {
info(stats.toString());
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
error("Failed to execute grid task.", e);
fail();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
index d95e0fa..7ac5546 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
@@ -41,7 +41,7 @@ public class GridSessionLoadTestJob extends ComputeJobAdapter {
}
/** {@inheritDoc} */
- @Override public Serializable execute() throws GridException {
+ @Override public Serializable execute() throws IgniteCheckedException {
assert taskSes != null;
Object arg = argument(0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
index 459b32c..e43e088 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
@@ -33,7 +33,7 @@ public class GridSessionLoadTestTask extends ComputeTaskAdapter<Integer, Boolean
private Map<String, Integer> params;
/** {@inheritDoc} */
- @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws GridException {
+ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteCheckedException {
assert taskSes != null;
assert arg != null;
assert arg > 0;
@@ -78,7 +78,7 @@ public class GridSessionLoadTestTask extends ComputeTaskAdapter<Integer, Boolean
/** {@inheritDoc} */
@SuppressWarnings("BusyWait")
- @Override public Boolean reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Boolean reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
assert taskSes != null;
assert results != null;
assert params != null;
@@ -112,7 +112,7 @@ public class GridSessionLoadTestTask extends ComputeTaskAdapter<Integer, Boolean
Thread.sleep(100);
}
catch (InterruptedException e) {
- throw new GridException("Thread interrupted.", e);
+ throw new IgniteCheckedException("Thread interrupted.", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
index 91dac32..116dada 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
@@ -34,7 +34,7 @@ public class GridStealingLoadTestJob extends ComputeJobAdapter {
private ComputeJobContext ctx;
/** {@inheritDoc} */
- @Override public Serializable execute() throws GridException {
+ @Override public Serializable execute() throws IgniteCheckedException {
if (log.isDebugEnabled())
log.debug("Executing job on node [nodeId=" + nodeId + ", jobId=" + ctx.getJobId() + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestTask.java
index 4e04e0e..ca5516e 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestTask.java
@@ -9,10 +9,10 @@
package org.gridgain.loadtests.direct.stealing;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
import java.util.*;
@@ -31,7 +31,7 @@ public class GridStealingLoadTestTask extends ComputeTaskAdapter<UUID, Integer>
private int stolenJobs;
/** {@inheritDoc} */
- @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, UUID arg) throws GridException {
+ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, UUID arg) throws IgniteCheckedException {
assert arg != null;
assert subgrid.size() > 1: "Test requires at least 2 nodes. One with load and another one to steal.";
@@ -75,7 +75,7 @@ public class GridStealingLoadTestTask extends ComputeTaskAdapter<UUID, Integer>
}
/** {@inheritDoc} */
- @Override public Integer reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
assert results != null;
for (ComputeJobResult res : results) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/discovery/GridGcTimeoutTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/discovery/GridGcTimeoutTest.java b/modules/core/src/test/java/org/gridgain/loadtests/discovery/GridGcTimeoutTest.java
index 9a919b3..a8c005f 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/discovery/GridGcTimeoutTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/discovery/GridGcTimeoutTest.java
@@ -28,10 +28,10 @@ public class GridGcTimeoutTest {
/**
* @param args Args.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("InfiniteLoopStatement")
- public static void main(String[] args) throws GridException {
+ public static void main(String[] args) throws IgniteCheckedException {
Ignite g = G.start(U.resolveGridGainUrl(CFG_PATH));
IgniteDataLoader<Long, String> ldr = g.dataLoader(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java
index 0095f16..05de5b8 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java
@@ -133,7 +133,7 @@ public class GridDsiClient implements Callable {
if (res2 != null)
srvStats = res2;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java
index 4d8f984..6a5dae7 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java
@@ -9,12 +9,10 @@
package org.gridgain.loadtests.dsi;
-import org.apache.ignite.Ignite;
+import org.apache.ignite.*;
import org.apache.ignite.lifecycle.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.springframework.context.ApplicationContext;
+import org.springframework.context.*;
/**
*
@@ -34,7 +32,7 @@ public class GridDsiLifecycleBean implements LifecycleBean {
private ApplicationContext springCtx;
/** {@inheritDoc} */
- @Override public void onLifecycleEvent(LifecycleEventType evt) throws GridException {
+ @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
switch (evt) {
case BEFORE_GRID_START:
break;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java
index 7eca098..82e57f0 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java
@@ -225,7 +225,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
try {
getId();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
@@ -240,7 +240,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
try {
ses = (GridDsiSession)get(GridDsiSession.getCacheKey(terminalId));
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
@@ -293,9 +293,9 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
/**
* @return ID.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private long getId() throws GridException {
+ private long getId() throws IgniteCheckedException {
GridCache<Object, Object> cache = ignite.cache(cacheName);
assert cache != null;
@@ -308,9 +308,9 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
/**
* @param o Object.
* @param cacheKey Key.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private void put(Object o, Object cacheKey) throws GridException {
+ private void put(Object o, Object cacheKey) throws IgniteCheckedException {
GridCache<Object, Object> cache = ignite.cache(cacheName);
assert cache != null;
@@ -324,10 +324,10 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
/**
* @param key Key.
* @return Object.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("ConstantConditions")
- private <T> Object get(Object key) throws GridException {
+ private <T> Object get(Object key) throws IgniteCheckedException {
return ignite.cache(cacheName).get(key);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequestTask.java
index fca80e4..a285319 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequestTask.java
@@ -9,8 +9,8 @@
package org.gridgain.loadtests.dsi;
+import org.apache.ignite.*;
import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.util.typedef.*;
import java.util.*;
@@ -20,12 +20,12 @@ import java.util.*;
*/
public class GridDsiRequestTask extends ComputeTaskSplitAdapter<GridDsiMessage, T3<Long, Integer, Integer>> {
/** {@inheritDoc} */
- @Override protected Collection<? extends ComputeJob> split(int arg0, GridDsiMessage msg) throws GridException {
+ @Override protected Collection<? extends ComputeJob> split(int arg0, GridDsiMessage msg) throws IgniteCheckedException {
return Collections.singletonList(new GridDsiPerfJob(msg));
}
/** {@inheritDoc} */
- @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
assert results.size() == 1;
return results.get(0).getData();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponseTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponseTask.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponseTask.java
index 0d81ac8..08e01be 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponseTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponseTask.java
@@ -9,8 +9,8 @@
package org.gridgain.loadtests.dsi;
+import org.apache.ignite.*;
import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.util.typedef.*;
import java.util.*;
@@ -20,12 +20,12 @@ import java.util.*;
*/
public class GridDsiResponseTask extends ComputeTaskSplitAdapter<GridDsiMessage, T3<Long, Integer, Integer>> {
/** {@inheritDoc} */
- @Override protected Collection<? extends ComputeJob> split(int arg0, GridDsiMessage msg) throws GridException {
+ @Override protected Collection<? extends ComputeJob> split(int arg0, GridDsiMessage msg) throws IgniteCheckedException {
return Collections.singletonList(new GridDsiPerfJob(msg));
}
/** {@inheritDoc} */
- @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
assert results.size() == 1;
return results.get(0).getData();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClient.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClient.java
index b044cdd..e6ce2b5 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClient.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClient.java
@@ -52,7 +52,7 @@ public class GridJobExecutionLoadTestClient implements Callable<Object> {
txCnt.increment();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
}
@@ -189,7 +189,7 @@ public class GridJobExecutionLoadTestClient implements Callable<Object> {
try {
rmts.execute(GridJobExecutionLoadTestTask.class, null);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
@@ -205,7 +205,7 @@ public class GridJobExecutionLoadTestClient implements Callable<Object> {
}
});
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
throw new IllegalStateException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java
index 90137b6..d0f6735 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java
@@ -209,7 +209,7 @@ public class GridJobExecutionLoadTestClientSemaphore implements Callable<Object>
try {
rmts.execute(GridJobExecutionLoadTestTask.class, null);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
@@ -225,7 +225,7 @@ public class GridJobExecutionLoadTestClientSemaphore implements Callable<Object>
}
});
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
throw new IllegalStateException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestJob.java
index 6b67fa9..0ae5d09 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestJob.java
@@ -9,8 +9,8 @@
package org.gridgain.loadtests.job;
+import org.apache.ignite.*;
import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
import java.io.*;
@@ -19,7 +19,7 @@ import java.io.*;
*/
public class GridJobExecutionLoadTestJob implements ComputeJob, Externalizable {
/** {@inheritDoc} */
- @Override public Object execute() throws GridException {
+ @Override public Object execute() throws IgniteCheckedException {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestTask.java
index a040b57..396f86c 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestTask.java
@@ -9,9 +9,9 @@
package org.gridgain.loadtests.job;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.util.typedef.*;
import org.jetbrains.annotations.*;
@@ -25,17 +25,17 @@ import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
public class GridJobExecutionLoadTestTask implements ComputeTask<Object, Object> {
/** {@inheritDoc} */
@Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg)
- throws GridException {
+ throws IgniteCheckedException {
return F.asMap(new GridJobExecutionLoadTestJob(), subgrid.get(0));
}
/** {@inheritDoc} */
- @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException {
+ @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
return REDUCE;
}
/** {@inheritDoc} */
- @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+ @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
index 6d3fcbd..de4f4b8 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
@@ -73,7 +73,7 @@ public class GridJobExecutionSingleNodeLoadTest {
X.println("Warming up...");
GridLoadTestUtils.runMultithreadedInLoop(new Callable<Object>() {
- @Override public Object call() throws GridException {
+ @Override public Object call() throws IgniteCheckedException {
g.compute().execute(GridJobExecutionLoadTestTask.class, null);
return null;
@@ -97,7 +97,7 @@ public class GridJobExecutionSingleNodeLoadTest {
catch (ComputeTaskCancelledException ignored) {
// No-op.
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
}
@@ -198,17 +198,17 @@ public class GridJobExecutionSingleNodeLoadTest {
private static class GridJobExecutionLoadTestTask implements ComputeTask<Object, Object> {
/** {@inheritDoc} */
@Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg)
- throws GridException {
+ throws IgniteCheckedException {
return F.asMap(new GridJobExecutionLoadTestJob(), subgrid.get(0));
}
/** {@inheritDoc} */
- @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException {
+ @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
return REDUCE;
}
/** {@inheritDoc} */
- @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+ @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
return null;
}
}
@@ -218,7 +218,7 @@ public class GridJobExecutionSingleNodeLoadTest {
*/
private static class GridJobExecutionLoadTestJob implements ComputeJob {
/** {@inheritDoc} */
- @Override public Object execute() throws GridException {
+ @Override public Object execute() throws IgniteCheckedException {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
index 31d5fac..851a083 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
@@ -187,17 +187,17 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest {
private static class GridJobExecutionLoadTestTask implements ComputeTask<Object, Object> {
/** {@inheritDoc} */
@Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg)
- throws GridException {
+ throws IgniteCheckedException {
return F.asMap(new GridJobExecutionLoadTestJob(), subgrid.get(0));
}
/** {@inheritDoc} */
- @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException {
+ @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
return REDUCE;
}
/** {@inheritDoc} */
- @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+ @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
return null;
}
}
@@ -207,7 +207,7 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest {
*/
private static class GridJobExecutionLoadTestJob implements ComputeJob {
/** {@inheritDoc} */
- @Override public Object execute() throws GridException {
+ @Override public Object execute() throws IgniteCheckedException {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
index 74ad52b..c3b293a 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
@@ -74,7 +74,7 @@ public class GridJobLoadTestJob implements ComputeJob {
}
/**{@inheritDoc}*/
- @Override public Integer execute() throws GridException {
+ @Override public Integer execute() throws IgniteCheckedException {
try {
if (log.isInfoEnabled())
log.info("Job started " + getJobInfo());
@@ -115,7 +115,7 @@ public class GridJobLoadTestJob implements ComputeJob {
try {
taskSes.setAttribute(String.valueOf(i), i);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
log.error("Set attribute failed.", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java
index d678bc6..f9b7084 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java
@@ -76,9 +76,9 @@ public class GridJobLoadTestSubmitter implements Runnable {
futures.add(comp.<Integer>future());
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// Should not be thrown since uses asynchronous execution.
- throw new GridRuntimeException(e);
+ throw new IgniteException(e);
}
}
}
@@ -102,7 +102,7 @@ public class GridJobLoadTestSubmitter implements Runnable {
catch (IgniteFutureCancelledException ignored) {
ignite.log().info(">>> Task cancelled: " + fut.getTaskSession().getId());
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
ignite.log().warning(
">>> Get operation for completed task failed: " + fut.getTaskSession().getId(), e);
}
@@ -127,7 +127,7 @@ public class GridJobLoadTestSubmitter implements Runnable {
futToCancel.cancel();
ignite.log().info("Task canceled: " + futToCancel.getTaskSession().getId());
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
ignite.log().warning(">>> Future cancellation failed: " + futToCancel.getTaskSession().getId(), e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestTask.java
index c2827f2..4f3f813 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestTask.java
@@ -9,9 +9,9 @@
package org.gridgain.loadtests.job;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
import org.jetbrains.annotations.*;
import java.util.*;
@@ -24,7 +24,7 @@ import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
public class GridJobLoadTestTask extends ComputeTaskAdapter<GridJobLoadTestParams, Integer> {
/**{@inheritDoc} */
@Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable GridJobLoadTestParams arg)
- throws GridException {
+ throws IgniteCheckedException {
assert !subgrid.isEmpty();
Map<ComputeJob, ClusterNode> jobs = new HashMap<>();
@@ -46,13 +46,13 @@ public class GridJobLoadTestTask extends ComputeTaskAdapter<GridJobLoadTestParam
*
* {@inheritDoc}
*/
- @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException {
+ @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
return res.getException() == null ? WAIT :
res.getException().getCause() instanceof AssertionError ? REDUCE : FAILOVER;
}
/**{@inheritDoc} */
- @Override public Integer reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
int sum = 0;
for (ComputeJobResult r: results) {