ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [16/24] incubator-ignite git commit: # ignite-26
Date Fri, 30 Jan 2015 16:52:22 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridTestStage.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridTestStage.java
index 7d32ea4,7d32ea4..7a6ced4
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridTestStage.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridTestStage.java
@@@ -47,8 -47,8 +47,7 @@@ class GridTestStage implements Streamer
      }
  
      /** {@inheritDoc} */
--    @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection<Object> evts)
--        throws IgniteCheckedException {
++    @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection<Object> evts) {
          return stageClos.apply(name(), ctx, evts);
      }
  }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java
index c8c9371,c8c9371..774a56d
--- a/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java
@@@ -242,7 -242,7 +242,7 @@@ public final class GridSingleExecutionT
      /** */
      public static class TestTask extends ComputeTaskSplitAdapter<Object, Object> {
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) {
              Collection<ComputeJob> jobs = new ArrayList<>(JOB_COUNT);
  
              for (int i = 0; i < JOB_COUNT; i++) {
@@@ -250,7 -250,7 +250,7 @@@
                      @IgniteLoggerResource
                      private IgniteLogger log;
  
--                    @Override public Serializable execute() throws IgniteCheckedException {
++                    @Override public Serializable execute() {
                          if (log.isInfoEnabled())
                              log.info("Executing job [index=" + argument(0) + ']');
  
@@@ -263,7 -263,7 +263,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Object reduce(List<ComputeJobResult> results) {
              assert results != null : "Unexpected result [results=" + results + ']';
              assert results.size() == JOB_COUNT : "Unexpected result [results=" + results + ']';
  
@@@ -278,7 -278,7 +278,7 @@@
          private ComputeTaskSession ses;
  
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) {
              Collection<ComputeJob> jobs = new ArrayList<>(JOB_COUNT);
  
              for (int i = 0; i < JOB_COUNT; i++) {
@@@ -286,7 -286,7 +286,7 @@@
                      @IgniteLoggerResource
                      private IgniteLogger log;
  
--                    @Override public Serializable execute() throws IgniteCheckedException {
++                    @Override public Serializable execute() {
                          if (log.isInfoEnabled())
                              log.info("Executing job [index=" + argument(0) + ']');
  
@@@ -306,7 -306,7 +306,7 @@@
  
          /** {@inheritDoc} */
          @Override public ComputeJobResultPolicy result(ComputeJobResult res,
--            List<ComputeJobResult> received) throws IgniteCheckedException {
++            List<ComputeJobResult> received) {
              ses.setAttribute("attr7", 7);
              ses.setAttribute("attr8", 8);
  
@@@ -314,7 -314,7 +314,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Object reduce(List<ComputeJobResult> results) {
              assert results != null : "Unexpected result [results=" + results + ']';
              assert results.size() == JOB_COUNT : "Unexpected result [results=" + results + ']';
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java
index e7412c3,e7412c3..f01231c
--- a/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java
@@@ -230,7 -230,7 +230,7 @@@ public class GridFileSwapSpaceSpiMultit
                          }
                      }
                  }
--                catch (IgniteCheckedException e) {
++                catch (IgniteException e) {
                      e.printStackTrace();
                  }
              }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheLoadPopulationTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheLoadPopulationTask.java
index a545acb,a545acb..87a01a9
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheLoadPopulationTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheLoadPopulationTask.java
@@@ -32,12 -32,12 +32,12 @@@ public class GridCacheLoadPopulationTas
      private static final long serialVersionUID = 1L;
  
      /** {@inheritDoc} */
--    @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public Void reduce(List<ComputeJobResult> results) {
          return null;
      }
  
      /** {@inheritDoc} */
--    @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) throws IgniteCheckedException {
++    @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) {
          Collection<ChunkPopulationJob> jobs = new ArrayList<>();
  
          int maxElements = 10000;
@@@ -82,7 -82,7 +82,7 @@@
  
          /** {@inheritDoc} */
          @SuppressWarnings({"unchecked", "ConstantConditions"})
--        @Override public Object execute() throws IgniteCheckedException {
++        @Override public Object execute() {
              Map<Object, TestValue> map = new TreeMap<>();
  
              for (int i = startElementIdx; i < startElementIdx + maxElements; i++) {
@@@ -97,7 -97,7 +97,7 @@@
              g.log().info("Putting values to partitioned cache [nodeId=" + g.cluster().localNode().id() + ", mapSize=" +
                  map.size() + ']');
  
--            g.cache(GridCacheMultiNodeLoadTest.CACHE_NAME).putAll(map);
++            g.jcache(GridCacheMultiNodeLoadTest.CACHE_NAME).putAll(map);
  
              return null;
          }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestJob.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestJob.java
index 668ea80,668ea80..7046ce4
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestJob.java
@@@ -41,7 -41,7 +41,7 @@@ public class GridLoadTestJob extends Co
  
      /** {@inheritDoc} */
      @SuppressWarnings("unchecked")
--    @Override public Serializable execute() throws IgniteCheckedException {
++    @Override public Serializable execute() {
          Integer i = this.<Integer>argument(0);
  
          assert i != null && i > 0;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestTask.java
index 4a5052a,4a5052a..b6769d5
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestTask.java
@@@ -38,7 -38,7 +38,7 @@@ public class GridLoadTestTask extends C
      private Ignite ignite;
  
      /** {@inheritDoc} */
--    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteCheckedException {
++    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) {
          assert arg != null;
          assert arg > 1;
  
@@@ -66,7 -66,7 +66,7 @@@
      }
  
      /** {@inheritDoc} */
--    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public Integer reduce(List<ComputeJobResult> results) {
          assert results != null;
  
          int retVal = 0;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
index 0249cf8,0249cf8..55cf7db
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
@@@ -131,7 -131,7 +131,7 @@@ public class GridMultiSplitsLoadTest ex
                          if (taskCnt % 500 == 0)
                              info(stats.toString());
                      }
--                    catch (IgniteCheckedException e) {
++                    catch (IgniteException e) {
                          error("Failed to execute grid task.", e);
  
                          fail();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
index 1ab142c,1ab142c..5cf8b7a
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
@@@ -127,7 -127,7 +127,7 @@@ public class GridMultiSplitsRedeployLoa
                          if (taskCnt % 500 == 0)
                              info(stats.toString());
                      }
--                    catch (IgniteCheckedException e) {
++                    catch (IgniteException e) {
                          error("Failed to execute grid task.", e);
  
                          fail();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestJobTarget.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestJobTarget.java
index 611c180,611c180..d86c212
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestJobTarget.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestJobTarget.java
@@@ -28,10 -28,10 +28,9 @@@ public class GridSingleSplitNewNodesTes
       * @param level Level.
       * @param jobSes Job session.
       * @return Always returns {@code 1}.
--     * @throws IgniteCheckedException If failed.
       */
      @SuppressWarnings("unused")
--    public int executeLoadTestJob(int level, ComputeTaskSession jobSes) throws IgniteCheckedException {
++    public int executeLoadTestJob(int level, ComputeTaskSession jobSes) {
          assert level > 0;
          assert jobSes != null;
  
@@@ -42,7 -42,7 +41,7 @@@
          }
          catch (InterruptedException e) {
              // Fail.
--            throw new IgniteCheckedException("Failed to wait for attribute.", e);
++            throw new IgniteException("Failed to wait for attribute.", e);
          }
  
          return 1;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
index afac145,afac145..2d95ff9
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
@@@ -38,7 -38,7 +38,7 @@@ public class GridSingleSplitNewNodesTes
      private ComputeLoadBalancer balancer;
  
      /** {@inheritDoc} */
--    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteCheckedException {
++    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) {
          assert !subgrid.isEmpty() : "Subgrid cannot be empty.";
  
          Map<ComputeJobAdapter, ClusterNode> jobs = new HashMap<>(subgrid.size());
@@@ -55,7 -55,7 +55,7 @@@
                  private ComputeTaskSession jobSes;
  
                  /** {@inheritDoc} */
--                @Override public Serializable execute() throws IgniteCheckedException {
++                @Override public Serializable execute() {
                      assert jobSes != null;
  
                      Integer arg = this.<Integer>argument(0);
@@@ -81,7 -81,7 +81,7 @@@
      }
  
      /** {@inheritDoc} */
--    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public Integer reduce(List<ComputeJobResult> results) {
          int retVal = 0;
  
          for (ComputeJobResult res : results) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
index dbaeb7b,dbaeb7b..885dac2
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
@@@ -152,7 -152,7 +152,7 @@@ public class GridSingleSplitsRedeployLo
                              info(stats.toString());
                      }
                  }
--                catch (IgniteCheckedException e) {
++                catch (IgniteException e) {
                      error("Failed to execute grid task.", e);
  
                      fail();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestJob.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestJob.java
index 9d931e1,9d931e1..62d5c9e
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestJob.java
@@@ -48,7 -48,7 +48,7 @@@ public class GridSessionLoadTestJob ext
      }
  
      /** {@inheritDoc} */
--    @Override public Serializable execute() throws IgniteCheckedException {
++    @Override public Serializable execute() {
          assert taskSes != null;
  
          Object arg = argument(0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestTask.java
index 6f7cff4,6f7cff4..7e92fcd
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestTask.java
@@@ -40,7 -40,7 +40,7 @@@ public class GridSessionLoadTestTask ex
      private Map<String, Integer> params;
  
      /** {@inheritDoc} */
--    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteCheckedException {
++    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) {
          assert taskSes != null;
          assert arg != null;
          assert arg > 0;
@@@ -85,7 -85,7 +85,7 @@@
  
      /** {@inheritDoc} */
      @SuppressWarnings("BusyWait")
--    @Override public Boolean reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public Boolean reduce(List<ComputeJobResult> results) {
          assert taskSes != null;
          assert results != null;
          assert params != null;
@@@ -119,7 -119,7 +119,7 @@@
                      Thread.sleep(100);
                  }
                  catch (InterruptedException e) {
--                    throw new IgniteCheckedException("Thread interrupted.", e);
++                    throw new IgniteException("Thread interrupted.", e);
                  }
              }
          }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestJob.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestJob.java
index 41f9a65,41f9a65..8d24c2c
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestJob.java
@@@ -41,7 -41,7 +41,7 @@@ public class GridStealingLoadTestJob ex
      private ComputeJobContext ctx;
  
      /** {@inheritDoc} */
--    @Override public Serializable execute() throws IgniteCheckedException {
++    @Override public Serializable execute() {
          UUID nodeId = ignite.configuration().getNodeId();
  
          if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestTask.java
index 76682f8,76682f8..4e0c998
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestTask.java
@@@ -39,7 -39,7 +39,7 @@@ public class GridStealingLoadTestTask e
      private int stolenJobs;
  
      /** {@inheritDoc} */
--    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, UUID arg) throws IgniteCheckedException {
++    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, UUID arg) {
          assert arg != null;
          assert subgrid.size() > 1: "Test requires at least 2 nodes. One with load and another one to steal.";
  
@@@ -83,7 -83,7 +83,7 @@@
      }
  
      /** {@inheritDoc} */
--    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public Integer reduce(List<ComputeJobResult> results) {
          assert results != null;
  
          for (ComputeJobResult res : results) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequestTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequestTask.java
index 7375ca7,7375ca7..a557856
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequestTask.java
@@@ -28,12 -28,12 +28,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 IgniteCheckedException {
++    @Override protected Collection<? extends ComputeJob> split(int arg0, GridDsiMessage msg) {
          return Collections.singletonList(new GridDsiPerfJob(msg));
      }
  
      /** {@inheritDoc} */
--    @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) {
          assert results.size() == 1;
  
          return results.get(0).getData();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponseTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponseTask.java
index 30558d4,30558d4..7fe6951
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponseTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponseTask.java
@@@ -28,12 -28,12 +28,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 IgniteCheckedException {
++    @Override protected Collection<? extends ComputeJob> split(int arg0, GridDsiMessage msg) {
          return Collections.singletonList(new GridDsiPerfJob(msg));
      }
  
      /** {@inheritDoc} */
--    @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) {
          assert results.size() == 1;
  
          return results.get(0).getData();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClient.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClient.java
index 194c73b,194c73b..861440a
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClient.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClient.java
@@@ -59,7 -59,7 +59,7 @@@ public class GridJobExecutionLoadTestCl
  
                  txCnt.increment();
              }
--            catch (IgniteCheckedException e) {
++            catch (IgniteException e) {
                  e.printStackTrace();
              }
          }
@@@ -196,7 -196,7 +196,7 @@@
                  try {
                      rmts.execute(GridJobExecutionLoadTestTask.class, null);
                  }
--                catch (IgniteCheckedException e) {
++                catch (IgniteException e) {
                      e.printStackTrace();
                  }
  
@@@ -212,7 -212,7 +212,7 @@@
                  }
              });
          }
--        catch (IgniteCheckedException e) {
++        catch (IgniteException e) {
              throw new IllegalStateException(e);
          }
      }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestJob.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestJob.java
index 8788cab,8788cab..fb3e9e7
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestJob.java
@@@ -27,7 -27,7 +27,7 @@@ import java.io.*
   */
  public class GridJobExecutionLoadTestJob implements ComputeJob, Externalizable {
      /** {@inheritDoc} */
--    @Override public Object execute() throws IgniteCheckedException {
++    @Override public Object execute() {
          return null;
      }
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestTask.java
index 2085696,2085696..9bb78b3
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestTask.java
@@@ -32,18 -32,18 +32,17 @@@ import static org.apache.ignite.compute
   */
  public class GridJobExecutionLoadTestTask implements ComputeTask<Object, Object> {
      /** {@inheritDoc} */
--    @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg)
--        throws IgniteCheckedException {
++    @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg) {
          return F.asMap(new GridJobExecutionLoadTestJob(), subgrid.get(0));
      }
  
      /** {@inheritDoc} */
--    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
++    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) {
          return REDUCE;
      }
  
      /** {@inheritDoc} */
--    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Nullable @Override public Object reduce(List<ComputeJobResult> results) {
          return null;
      }
  }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
index d783e5f,d783e5f..f7884de
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
@@@ -20,6 -20,6 +20,7 @@@ package org.apache.ignite.loadtests.job
  import org.apache.ignite.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.compute.*;
++import org.apache.ignite.internal.compute.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.loadtests.util.*;
  import org.apache.ignite.testframework.*;
@@@ -104,7 -104,7 +105,7 @@@ public class GridJobExecutionSingleNode
                                  catch (ComputeTaskCancelledException ignored) {
                                      // No-op.
                                  }
--                                catch (IgniteCheckedException e) {
++                                catch (IgniteException e) {
                                      e.printStackTrace();
                                  }
                              }
@@@ -204,18 -204,18 +205,17 @@@
       */
      private static class GridJobExecutionLoadTestTask implements ComputeTask<Object, Object> {
          /** {@inheritDoc} */
--        @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg)
--            throws IgniteCheckedException {
++        @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg) {
              return F.asMap(new GridJobExecutionLoadTestJob(), subgrid.get(0));
          }
  
          /** {@inheritDoc} */
--        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) {
              return REDUCE;
          }
  
          /** {@inheritDoc} */
--        @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Nullable @Override public Object reduce(List<ComputeJobResult> results) {
              return null;
          }
      }
@@@ -225,7 -225,7 +225,7 @@@
       */
      private static class GridJobExecutionLoadTestJob implements ComputeJob {
          /** {@inheritDoc} */
--        @Override public Object execute() throws IgniteCheckedException {
++        @Override public Object execute() {
              return null;
          }
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
index 0d1d719,83603ab..4e6d590
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
@@@ -194,18 -194,18 +194,17 @@@ public class GridJobExecutionSingleNode
       */
      private static class GridJobExecutionLoadTestTask implements ComputeTask<Object, Object> {
          /** {@inheritDoc} */
--        @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg)
--            throws IgniteCheckedException {
++        @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg) {
              return F.asMap(new GridJobExecutionLoadTestJob(), subgrid.get(0));
          }
  
          /** {@inheritDoc} */
--        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) {
              return REDUCE;
          }
  
          /** {@inheritDoc} */
--        @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Nullable @Override public Object reduce(List<ComputeJobResult> results) {
              return null;
          }
      }
@@@ -215,7 -215,7 +214,7 @@@
       */
      private static class GridJobExecutionLoadTestJob implements ComputeJob {
          /** {@inheritDoc} */
--        @Override public Object execute() throws IgniteCheckedException {
++        @Override public Object execute() {
              return null;
          }
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestJob.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestJob.java
index 3c8e8f8,3c8e8f8..df7ab83
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestJob.java
@@@ -81,7 -81,7 +81,7 @@@ public class GridJobLoadTestJob impleme
      }
  
      /**{@inheritDoc}*/
--    @Override public Integer execute() throws IgniteCheckedException {
++    @Override public Integer execute() {
          try {
              if (log.isInfoEnabled())
                  log.info("Job started " + getJobInfo());
@@@ -122,7 -122,7 +122,7 @@@
                  try {
                      taskSes.setAttribute(String.valueOf(i), i);
                  }
--                catch (IgniteCheckedException e) {
++                catch (IgniteException e) {
                      log.error("Set attribute failed.", e);
                  }
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestTask.java
index 9745c5f,9745c5f..5480538
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestTask.java
@@@ -31,8 -31,8 +31,7 @@@ import static org.apache.ignite.compute
   */
  public class GridJobLoadTestTask extends ComputeTaskAdapter<GridJobLoadTestParams, Integer> {
      /**{@inheritDoc} */
--    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable GridJobLoadTestParams arg)
--        throws IgniteCheckedException {
++    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable GridJobLoadTestParams arg) {
          assert !subgrid.isEmpty();
  
          Map<ComputeJob, ClusterNode> jobs = new HashMap<>();
@@@ -54,13 -54,13 +53,13 @@@
       *
       * {@inheritDoc}
       */
--    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
++    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) {
          return res.getException() == null ? WAIT :
              res.getException().getCause() instanceof AssertionError ? REDUCE : FAILOVER;
      }
  
      /**{@inheritDoc} */
--    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public Integer reduce(List<ComputeJobResult> results) {
          int sum = 0;
  
          for (ComputeJobResult r: results) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java
index 264e8de,264e8de..6281637
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java
@@@ -71,9 -71,9 +71,9 @@@ public class GridContinuousMapperTask1 
       * Sends job to node.
       *
       * @param n Node.
--     * @throws IgniteCheckedException If failed.
++     * @throws IgniteException If failed.
       */
--    private void sendJob(ClusterNode n) throws IgniteCheckedException {
++    private void sendJob(ClusterNode n) {
          try {
              int jobId = queue.take();
  
@@@ -93,13 -93,13 +93,12 @@@
              }, n);
          }
          catch (InterruptedException e) {
--            throw new IgniteCheckedException(e);
++            throw new IgniteException(e);
          }
      }
  
      /** {@inheritDoc} */
--    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Integer arg)
--        throws IgniteCheckedException {
++    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Integer arg) {
          maxExecs = arg;
  
          // Start worker thread.
@@@ -115,9 -115,9 +114,9 @@@
      }
  
      /** {@inheritDoc} */
--    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
++    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) {
          if (res.getException() != null)
--            throw new IgniteCheckedException(res.getException());
++            throw new IgniteException(res.getException());
  
          TestObject o = res.getData();
  
@@@ -132,7 -132,7 +131,7 @@@
      }
  
      /** {@inheritDoc} */
--    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public Integer reduce(List<ComputeJobResult> results) {
          X.println(">>> Reducing task...");
  
          t.interrupt();
@@@ -141,7 -141,7 +140,7 @@@
              t.join();
          }
          catch (InterruptedException e) {
--            throw new IgniteCheckedException(e);
++            throw new IgniteException(e);
          }
  
          return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java
index 693930a,693930a..1ad078b
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java
@@@ -35,8 -35,8 +35,7 @@@ public class GridContinuousMapperTask2 
      private Ignite g;
  
      /** {@inheritDoc} */
--    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable int[] jobIds)
--        throws IgniteCheckedException {
++    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable int[] jobIds) {
          Map<ComputeJob, ClusterNode> mappings = new HashMap<>(jobIds.length);
  
          Iterator<ClusterNode> nodeIter = g.cluster().forRemotes().nodes().iterator();
@@@ -70,7 -70,7 +69,7 @@@
      }
  
      /** {@inheritDoc} */
--    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
++    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) {
          TestObject o = res.getData();
  
          X.println("Received job result from node [resId=" + o.getId() + ", node=" + res.getNode().id() + ']');
@@@ -79,7 -79,7 +78,7 @@@
      }
  
      /** {@inheritDoc} */
--    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public Integer reduce(List<ComputeJobResult> results) {
          X.println(">>> Reducing task...");
  
          return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java
index 116dba4,116dba4..acbdbfd
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java
@@@ -20,6 -20,6 +20,7 @@@ package org.apache.ignite.loadtests.mer
  import org.apache.ignite.*;
  import org.apache.ignite.compute.*;
  import org.apache.ignite.internal.*;
++import org.apache.ignite.lang.*;
  import org.apache.ignite.resources.*;
  import org.apache.ignite.internal.util.typedef.*;
  
@@@ -61,7 -61,7 +62,7 @@@ public class GridMergeSortLoadTask exte
                  // Task execution result future.
                  private ComputeTaskFuture<int[]> fut;
  
--                @Override public Object execute() throws IgniteCheckedException {
++                @Override public Object execute() {
                      if (arr.length == 1)
                          return arr;
  
@@@ -77,8 -77,8 +78,8 @@@
  
                          // Add a listener to the future, that will resume the
                          // parent task once the child one is completed.
--                        fut.listenAsync(new CI1<IgniteInternalFuture<int[]>>() {
--                            @Override public void apply(IgniteInternalFuture<int[]> fut) {
++                        fut.listenAsync(new CI1<IgniteFuture<int[]>>() {
++                            @Override public void apply(IgniteFuture<int[]> fut) {
                                  // CONTINUATION:
                                  // =============
                                  // Resume suspended job execution.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/EventClosure.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/streamer/EventClosure.java
index 0f868a2,0f868a2..258ae7a
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/EventClosure.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/EventClosure.java
@@@ -38,7 -38,7 +38,7 @@@ class EventClosure implements IgniteInC
              try {
                  streamer.addEvent(rnd.nextInt(rndRange));
              }
--            catch (IgniteCheckedException e) {
++            catch (IgniteException e) {
                  X.println("Failed to add streamer event: " + e);
              }
          }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/average/TestStage.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/streamer/average/TestStage.java
index cf8ac0b,cf8ac0b..925c9f6
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/average/TestStage.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/average/TestStage.java
@@@ -34,8 -34,8 +34,7 @@@ class TestStage implements StreamerStag
      }
  
      /** {@inheritDoc} */
--    @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection<Integer> evts)
--        throws IgniteCheckedException {
++    @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection<Integer> evts) {
          ConcurrentMap<String, TestAverage> loc = ctx.localSpace();
  
          TestAverage avg = loc.get("avg");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
index 935b531,935b531..2a3b05a
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
@@@ -640,7 -640,7 +640,7 @@@ public class GridOptimizedMarshallerTes
          }
  
          /** {@inheritDoc} */
--        @Override public Object execute() throws IgniteCheckedException {
++        @Override public Object execute() {
              assert false;
  
              return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
index 125a438,125a438..36cafce
--- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
@@@ -20,7 -20,7 +20,7 @@@ package org.apache.ignite.messaging
  import org.apache.ignite.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.configuration.*;
--import org.apache.ignite.internal.*;
++import org.apache.ignite.lang.*;
  import org.apache.ignite.marshaller.optimized.*;
  import org.apache.ignite.resources.*;
  import org.apache.ignite.spi.discovery.tcp.*;
@@@ -1025,9 -1025,9 +1025,9 @@@ public class GridMessagingSelfTest exte
          final String topic = "topic";
  
          UUID id = msg.remoteListen(topic, new P2<UUID, Object>() {
--            @Override
--            public boolean apply(UUID nodeId, Object msg) {
--                System.out.println(Thread.currentThread().getName() + " Listener received new message [msg=" + msg + ", senderNodeId=" + nodeId + ']');
++            @Override public boolean apply(UUID nodeId, Object msg) {
++                System.out.println(Thread.currentThread().getName() +
++                    " Listener received new message [msg=" + msg + ", senderNodeId=" + nodeId + ']');
  
                  msgCnt.incrementAndGet();
  
@@@ -1037,7 -1037,7 +1037,7 @@@
  
          Assert.assertNull(id);
  
--        IgniteInternalFuture<UUID> fut = msg.future();
++        IgniteFuture<UUID> fut = msg.future();
  
          Assert.assertNotNull(fut);
  
@@@ -1065,7 -1065,7 +1065,7 @@@
  
          msg.stopRemoteListen(id);
  
--        IgniteInternalFuture<?> stopFut = msg.future();
++        IgniteFuture<?> stopFut = msg.future();
  
          Assert.assertNotNull(stopFut);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java
index 380ecb3,380ecb3..9a9c0d8
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java
@@@ -116,7 -116,7 +116,7 @@@ public class GridP2PJobClassLoaderSelfT
          private static ClassLoader ldr;
  
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) {
              assert gridSize == 1;
  
              ldr = getClass().getClassLoader();
@@@ -124,7 -124,7 +124,7 @@@
              return Collections.singletonList(new ComputeJobAdapter() {
                      /** {@inheritDoc} */
                      @SuppressWarnings({"ObjectEquality"})
--                    public Serializable execute() throws IgniteCheckedException {
++                    public Serializable execute() {
                          assert getClass().getClassLoader() == ldr;
  
                          return null;
@@@ -133,7 -133,7 +133,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Object reduce(List<ComputeJobResult> results) {
              // Nothing to reduce.
              return null;
          }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java
index 65e37d8,65e37d8..0d4ae96
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java
@@@ -207,8 -207,8 +207,7 @@@ public class GridP2PLocalDeploymentSelf
       */
      public static class TestTask extends ComputeTaskAdapter<UUID, Serializable> {
          /** {@inheritDoc} */
--        @Override public Map<? extends ComputeJob, ClusterNode> map(final List<ClusterNode> subgrid, UUID arg)
--            throws IgniteCheckedException {
++        @Override public Map<? extends ComputeJob, ClusterNode> map(final List<ClusterNode> subgrid, UUID arg) {
              taskLdr = getClass().getClassLoader();
  
              for (ClusterNode node : subgrid) {
@@@ -216,11 -216,11 +215,11 @@@
                      return Collections.singletonMap(new TestJob(arg), node);
              }
  
--            throw new IgniteCheckedException("Failed to find target node: " + arg);
++            throw new IgniteException("Failed to find target node: " + arg);
          }
  
          /** {@inheritDoc} */
--        @Override public int[] reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public int[] reduce(List<ComputeJobResult> results) {
              assert results.size() == 1;
  
              assert taskLdr == getClass().getClassLoader();
@@@ -242,7 -242,7 +241,7 @@@
              public TestJob(UUID nodeId) { super(nodeId); }
  
              /** {@inheritDoc} */
--            @Override public Serializable execute() throws IgniteCheckedException {
++            @Override public Serializable execute() {
                  assert ignite.configuration().getNodeId().equals(argument(0));
  
                  jobLdr = getClass().getClassLoader();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
index 7cc1210,51e04ee..08a3a30
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
@@@ -94,7 -94,7 +94,7 @@@ public class GridP2PMissedResourceCache
  
              assert false; // Exception must be thrown.
          }
--        catch (IgniteCheckedException e) {
++        catch (IgniteException e) {
              // Throwing exception is a correct behaviour.
              info("Received correct exception: " + e);
          }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java
index a26c712,a26c712..cb6a895
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java
@@@ -129,7 -129,7 +129,7 @@@ public class GridP2PRecursionTaskSelfTe
       */
      public static class FactorialTask extends ComputeTaskAdapter<Long, Long> {
          /** {@inheritDoc} */
--        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Long arg) throws IgniteCheckedException {
++        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Long arg) {
              assert arg > 1;
  
              Map<FactorialJob, ClusterNode> map = new HashMap<>();
@@@ -150,12 -150,12 +150,11 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Long reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Long reduce(List<ComputeJobResult> results) {
              long retVal = 0;
  
--            for (ComputeJobResult res : results) {
++            for (ComputeJobResult res : results)
                  retVal += (Long)res.getData();
--            }
  
              return retVal;
          }
@@@ -176,7 -176,7 +175,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Long execute() throws IgniteCheckedException {
++        @Override public Long execute() {
              Long arg = argument(0);
  
              assert arg != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java
index 575d9e4,575d9e4..f49958e
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java
@@@ -226,7 -226,7 +226,7 @@@ public class GridP2PRemoteClassLoadersS
          }
  
          /** {@inheritDoc} */
--        @Override public Serializable execute() throws IgniteCheckedException {
++        @Override public Serializable execute() {
              // Return next value.
              return GridP2PTestStaticVariable.staticVar++;
          }
@@@ -245,8 -245,8 +245,7 @@@
          private Ignite ignite;
  
          /** {@inheritDoc} */
--        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Serializable arg)
--            throws IgniteCheckedException {
++        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Serializable arg) {
              Map<ComputeJob, ClusterNode> map = new HashMap<>(subgrid.size());
  
              for (ClusterNode node : subgrid) {
@@@ -258,7 -258,7 +257,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Object reduce(List<ComputeJobResult> results) {
              assert results.size() == 1;
  
              ComputeJobResult res = results.get(0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java
index 4a2c6ba,4a2c6ba..2f3f7b4
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java
@@@ -48,7 -48,7 +48,7 @@@ public class GridP2PTestJob extends Com
      }
  
      /** {@inheritDoc} */
--    @Override public Serializable execute() throws IgniteCheckedException {
++    @Override public Serializable execute() {
          assert taskSes != null;
  
          ClassLoader ldr = getClass().getClassLoader();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTask.java
index 91d1b2a,91d1b2a..6b0811f
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTask.java
@@@ -41,7 -41,7 +41,7 @@@ public class GridP2PTestTask extends Co
      private Ignite ignite;
  
      /** {@inheritDoc} */
--    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException {
++    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) {
          assert subgrid != null;
          assert !subgrid.isEmpty();
  
@@@ -66,7 -66,7 +66,7 @@@
      }
  
      /** {@inheritDoc} */
--    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++    @Override public Integer reduce(List<ComputeJobResult> results) {
          assert results.size() == 1 : "Results [received=" + results.size() + ", expected=" + 1 + ']';
  
          ComputeJobResult res = results.get(0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java
index 9432660,451b503..ebc6afc
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java
@@@ -80,7 -80,7 +80,7 @@@ public class GridP2PTimeoutSelfTest ext
  
                  assert false; // Timeout exception must be thrown.
              }
--            catch (IgniteCheckedException ignored) {
++            catch (IgniteException ignored) {
                  // Throwing exception is a correct behaviour.
              }
          }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java
index a3b6600,a3b6600..8c12a69
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java
@@@ -200,7 -200,7 +200,7 @@@ public class GridSessionCancelSiblingsF
          private volatile int taskNum = -1;
  
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) {
              if (log.isInfoEnabled())
                  log.info("Splitting jobs [task=" + this + ", gridSize=" + gridSize + ", arg=" + arg + ']');
  
@@@ -259,7 -259,7 +259,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) {
              if (log.isInfoEnabled())
                  log.info("Received job result [job=" + this + ", result=" + res + ']');
  
@@@ -267,7 -267,7 +267,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public String reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public String reduce(List<ComputeJobResult> results) {
              if (log.isInfoEnabled())
                  log.info("Aggregating job [job=" + this + ", results=" + results + ']');
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java
index 6d0abe4,6d0abe4..1a158b8
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java
@@@ -187,7 -187,7 +187,7 @@@ public class GridSessionCancelSiblingsF
          private volatile int taskNum = -1;
  
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) {
              if (log.isInfoEnabled())
                  log.info("Splitting job [task=" + this + ", gridSize=" + gridSize + ", arg=" + arg + ']');
  
@@@ -210,7 -210,7 +210,7 @@@
  
                      /** {@inheritDoc} */
                      @SuppressWarnings({"BusyWait"})
--                    @Override public Object execute() throws IgniteCheckedException {
++                    @Override public Object execute() {
                          assert taskSes != null;
  
                          thread = Thread.currentThread();
@@@ -272,13 -272,13 +272,12 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public ComputeJobResultPolicy result(ComputeJobResult result, List<ComputeJobResult> received)
--            throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult result, List<ComputeJobResult> received) {
              return received.size() == SPLIT_COUNT ? ComputeJobResultPolicy.REDUCE : ComputeJobResultPolicy.WAIT;
          }
  
          /** {@inheritDoc} */
--        @Override public String reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public String reduce(List<ComputeJobResult> results) {
              if (log.isInfoEnabled())
                  log.info("Aggregating job [job=" + this + ", results=" + results + ']');
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java
index da4b3b0,da4b3b0..4b25838
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java
@@@ -194,7 -194,7 +194,7 @@@ public class GridSessionCancelSiblingsF
          private volatile int taskNum = -1;
  
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) {
              if (log.isInfoEnabled())
                  log.info("Splitting job [job=" + this + ", gridSize=" + gridSize + ", arg=" + arg + ']');
  
@@@ -265,8 -265,8 +265,7 @@@
  
          /** {@inheritDoc} */
          @SuppressWarnings("deprecation")
--        @Override public ComputeJobResultPolicy result(ComputeJobResult result, List<ComputeJobResult> received)
--            throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult result, List<ComputeJobResult> received) {
              if (received.size() == 1) {
                  Collection<ComputeJobSibling> jobSiblings = taskSes.getJobSiblings();
  
@@@ -285,7 -285,7 +284,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public String reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public String reduce(List<ComputeJobResult> results) {
              if (log.isInfoEnabled())
                  log.info("Aggregating job [job=" + this + ", results=" + results + ']');
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
index 1589901,1589901..0bdc1f8
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
@@@ -154,7 -154,7 +154,7 @@@ public abstract class GridSessionCheckp
          private Ignite ignite;
  
          /** {@inheritDoc} */
--        @Override protected Collection<ComputeJobAdapter> split(int gridSize, Object arg) throws IgniteCheckedException {
++        @Override protected Collection<ComputeJobAdapter> split(int gridSize, Object arg) {
              for (int i = 0; i < SPLIT_COUNT; i++) {
                  ses.saveCheckpoint("map:session:key:" + i, "map:session:testval:" + i);
                  ses.saveCheckpoint("map:global:key:" + i, "map:global:testval:" + i,
@@@ -169,7 -169,7 +169,7 @@@
                      private static final long serialVersionUID = -9118687978815477993L;
  
                      /** {@inheritDoc} */
--                    @Override public Serializable execute() throws IgniteCheckedException {
++                    @Override public Serializable execute() {
                          ses.saveCheckpoint("job:session:key:" + argument(0), "job:session:testval:" + argument(0));
                          ses.saveCheckpoint("job:global:key:" + argument(0), "job:global:testval:" + argument(0),
                              ComputeTaskSessionScope.GLOBAL_SCOPE, 0);
@@@ -183,7 -183,7 +183,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Object reduce(List<ComputeJobResult> results) {
              int res = 0;
  
              for (ComputeJobResult result : results) {
@@@ -201,7 -201,7 +201,7 @@@
                  Thread.sleep(200);
              }
              catch (InterruptedException e) {
--                throw new IgniteCheckedException("Got interrupted during reducing.", e);
++                throw new IgniteException("Got interrupted during reducing.", e);
              }
  
              try {
@@@ -222,7 -222,7 +222,7 @@@
                  }
              }
              catch (Exception e) {
--                throw new IgniteCheckedException("Running state check failure.", e);
++                throw new IgniteException("Running state check failure.", e);
              }
  
              return res;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java
index 8d636ea,8d636ea..1fefcfd
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java
@@@ -67,7 -67,7 +67,7 @@@ public class GridSessionCollisionSpiSel
      @ComputeTaskSessionFullSupport
      private static class GridSessionTestTask extends ComputeTaskSplitAdapter<Object, Object> {
          /** {@inheritDoc} */
--        @Override protected Collection<ComputeJobAdapter> split(int gridSize, Object arg) throws IgniteCheckedException {
++        @Override protected Collection<ComputeJobAdapter> split(int gridSize, Object arg) {
              Collection<ComputeJobAdapter> jobs = new ArrayList<>(gridSize);
  
              for (int i = 0; i < gridSize; i++) {
@@@ -105,7 -105,7 +105,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Object reduce(List<ComputeJobResult> results) {
              // Nothing to reduce.
              return null;
          }
@@@ -132,7 -132,7 +132,7 @@@
                      if (log.isInfoEnabled())
                          log.info("Set session attribute for job: " + jobId);
                  }
--                catch (IgniteCheckedException e) {
++                catch (IgniteException e) {
                      log.error("Failed to set session attribute: " + job, e);
                  }
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java
index 11addeb,11addeb..2727e9a
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java
@@@ -173,7 -173,7 +173,7 @@@ public class GridSessionFutureWaitJobAt
          private volatile int taskNum = -1;
  
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) {
              if (log.isInfoEnabled())
                  log.info("Splitting job [task=" + this + ", gridSize=" + gridSize + ", arg=" + arg + ']');
  
@@@ -187,7 -187,7 +187,7 @@@
  
              for (int i = 1; i <= SPLIT_COUNT; i++) {
                  jobs.add(new ComputeJobAdapter(i) {
--                    @Override public Serializable execute() throws IgniteCheckedException {
++                    @Override public Serializable execute() {
                          assert taskSes != null;
  
                          if (log.isInfoEnabled()) {
@@@ -222,8 -222,8 +222,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received)
--            throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) {
              if (res.getException() != null)
                  throw res.getException();
  
@@@ -231,7 -231,7 +230,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Integer reduce(List<ComputeJobResult> results) {
              if (log.isInfoEnabled())
                  log.info("Reducing job [job=" + this + ", results=" + results + ']');
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java
index b9b7f6d,b9b7f6d..1a6ac25
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java
@@@ -170,7 -170,7 +170,7 @@@ public class GridSessionFutureWaitTaskA
          private volatile int taskNum = -1;
  
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) {
              if (log.isInfoEnabled())
                  log.info("Splitting job [job=" + this + ", gridSize=" + gridSize + ", arg=" + arg + ']');
  
@@@ -199,8 -199,8 +199,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received)
--            throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) {
              if (res.getException() != null)
                  throw res.getException();
  
@@@ -230,7 -230,7 +229,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Integer reduce(List<ComputeJobResult> results) {
              if (log.isInfoEnabled())
                  log.info("Reducing job [job=" + this + ", results=" + results + ']');
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java
index ba0d104,ba0d104..2fc8677
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java
@@@ -84,7 -84,7 +84,7 @@@ public class GridSessionJobFailoverSelf
          private boolean jobFailed;
  
          /** {@inheritDoc} */
--        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, String arg) throws IgniteCheckedException {
++        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, String arg) {
              ses.setAttribute("fail", true);
  
              for (int i = 0; i < 10; i++) {
@@@ -94,14 -94,14 +94,14 @@@
  
              return Collections.singletonMap(new ComputeJobAdapter(arg) {
                  /** {@inheritDoc} */
--                @Override public Serializable execute() throws IgniteCheckedException {
++                @Override public Serializable execute() {
                      boolean fail;
  
                      try {
                          fail = ses.waitForAttribute("fail", 0);
                      }
                      catch (InterruptedException e) {
--                        throw new IgniteCheckedException("Got interrupted while waiting for attribute to be set.", e);
++                        throw new IgniteException("Got interrupted while waiting for attribute to be set.", e);
                      }
  
                      if (fail) {
@@@ -112,7 -112,7 +112,7 @@@
                                  ses.setAttribute("test.job.attr." + i, ii);
                          }
  
--                        throw new IgniteCheckedException("Job exception.");
++                        throw new IgniteException("Job exception.");
                      }
  
                      try {
@@@ -129,7 -129,7 +129,7 @@@
                          }
                      }
                      catch (InterruptedException e) {
--                        throw new IgniteCheckedException("Got interrupted while waiting for attribute to be set.", e);
++                        throw new IgniteException("Got interrupted while waiting for attribute to be set.", e);
                      }
  
                      // This job does not return any result.
@@@ -139,8 -139,8 +139,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received)
--            throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) {
              if (res.getException() != null) {
                  assert !jobFailed;
  
@@@ -153,7 -153,7 +152,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Object reduce(List<ComputeJobResult> results) {
              assert results.size() == 1;
  
              return results.get(0).getData();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java
index 011618c,011618c..0e20069
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java
@@@ -137,7 -137,7 +137,7 @@@ public class GridSessionJobWaitTaskAttr
          private ComputeTaskSession taskSes;
  
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) {
              assert taskSes != null;
  
              if (log.isInfoEnabled())
@@@ -147,7 -147,7 +147,7 @@@
  
              for (int i = 1; i <= SPLIT_COUNT; i++) {
                  jobs.add(new ComputeJobAdapter(i) {
--                    @Override public Serializable execute() throws IgniteCheckedException {
++                    @Override public Serializable execute() {
                          assert taskSes != null;
  
                          if (log.isInfoEnabled())
@@@ -166,7 -166,7 +166,7 @@@
                                  fail("Invalid test session value: " + val);
                              }
                              catch (InterruptedException e) {
--                                throw new IgniteCheckedException("Failed to get attribute due to interruption.", e);
++                                throw new IgniteException("Failed to get attribute due to interruption.", e);
                              }
                          }
  
@@@ -179,8 -179,8 +179,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public ComputeJobResultPolicy result(ComputeJobResult result, List<ComputeJobResult> received)
--            throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult result, List<ComputeJobResult> received) {
              if (result.getException() != null)
                  throw result.getException();
  
@@@ -196,7 -196,7 +195,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Integer reduce(List<ComputeJobResult> results) {
              if (log.isInfoEnabled())
                  log.info("Reducing job [job=" + this + ", results=" + results + ']');
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java
index d148d37,d148d37..e385914
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java
@@@ -21,6 -21,6 +21,7 @@@ import org.apache.ignite.*
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.compute.*;
  import org.apache.ignite.configuration.*;
++import org.apache.ignite.internal.*;
  import org.apache.ignite.resources.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.testframework.*;
@@@ -136,8 -136,8 +137,7 @@@ public class GridSessionLoadSelfTest ex
          private Map<String, Integer> params;
  
          /** {@inheritDoc} */
--        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg)
--            throws IgniteCheckedException {
++        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) {
              assert taskSes != null;
              assert arg != null;
              assert arg > 1;
@@@ -173,7 -173,7 +173,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Boolean reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Boolean reduce(List<ComputeJobResult> results) {
              assert taskSes != null;
              assert results != null;
              assert params != null;
@@@ -204,8 -204,8 +204,14 @@@
                          allAttrReceived = false;
                  }
  
--                if (!allAttrReceived)
--                    U.sleep(1000);
++                if (!allAttrReceived) {
++                    try {
++                        U.sleep(1000);
++                    }
++                    catch (IgniteInterruptedCheckedException e) {
++                        throw new IgniteException(e);
++                    }
++                }
              }
  
              if (log.isDebugEnabled()) {
@@@ -238,7 -238,7 +244,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Serializable execute() throws IgniteCheckedException {
++        @Override public Serializable execute() {
              assert taskSes != null;
              assert argument(0) != null;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java
index 3cfcd81,3cfcd81..b5ed56c
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java
@@@ -177,7 -177,7 +177,7 @@@ public class GridSessionSetFutureAttrib
          private volatile int taskNum = -1;
  
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) {
              if (log.isInfoEnabled())
                  log.info("Splitting job [task=" + this + ", gridSize=" + gridSize + ", arg=" + arg + ']');
  
@@@ -192,7 -192,7 +192,7 @@@
              for (int i = 1; i <= SPLIT_COUNT; i++) {
                  jobs.add(new ComputeJobAdapter(i) {
                      /** {@inheritDoc} */
--                    @Override public Serializable execute() throws IgniteCheckedException {
++                    @Override public Serializable execute() {
                          assert taskSes != null;
  
                          if (log.isInfoEnabled())
@@@ -213,7 -213,7 +213,7 @@@
                                  return 1;
                          }
                          catch (InterruptedException e) {
--                            throw new IgniteCheckedException("Failed to get attribute due to interruption.", e);
++                            throw new IgniteException("Failed to get attribute due to interruption.", e);
                          }
  
                          return 0;
@@@ -225,8 -225,8 +225,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public ComputeJobResultPolicy result(ComputeJobResult result, List<ComputeJobResult> received)
--            throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult result, List<ComputeJobResult> received) {
              if (result.getException() != null)
                  throw result.getException();
  
@@@ -234,7 -234,7 +233,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Integer reduce(List<ComputeJobResult> results) {
              if (log.isInfoEnabled())
                  log.info("Reducing job [job=" + this + ", results=" + results + ']');
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2b9eaa/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
index dcbb741,dcbb741..cd86476
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
@@@ -139,7 -139,7 +139,7 @@@ public class GridSessionSetFutureAttrib
          private ComputeTaskSession taskSes;
  
          /** {@inheritDoc} */
--        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws IgniteCheckedException {
++        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) {
              if (log.isInfoEnabled())
                  log.info("Splitting job [job=" + this + ", gridSize=" + gridSize + ", arg=" + arg + ']');
  
@@@ -148,7 -148,7 +148,7 @@@
              for (int i = 1; i <= SPLIT_COUNT; i++) {
                  jobs.add(new ComputeJobAdapter(i) {
                      @SuppressWarnings({"UnconditionalWait"})
--                    public Serializable execute() throws IgniteCheckedException {
++                    public Serializable execute() {
                          assert taskSes != null;
  
                          if (log.isInfoEnabled())
@@@ -167,7 -167,7 +167,7 @@@
                              return 1;
                          }
                          catch (InterruptedException e) {
--                            throw new IgniteCheckedException("Failed to wait for listener due to interruption.", e);
++                            throw new IgniteException("Failed to wait for listener due to interruption.", e);
                          }
                      }
                  });
@@@ -177,8 -177,8 +177,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received)
--            throws IgniteCheckedException {
++        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) {
              if (res.getException() != null)
                  throw res.getException();
  
@@@ -186,7 -186,7 +185,7 @@@
          }
  
          /** {@inheritDoc} */
--        @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
++        @Override public Integer reduce(List<ComputeJobResult> results) {
              if (log.isInfoEnabled())
                  log.info("Reducing job [job=" + this + ", results=" + results + ']');
  


Mime
View raw message