http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java index 3f7d4e1..38fdff1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java @@ -292,7 +292,7 @@ public class GridJobProcessor extends GridProcessorAdapter { * @param sndReply {@code True} to send reply. */ private void rejectJob(GridJobWorker job, boolean sndReply) { - IgniteCheckedException e = new ComputeExecutionRejectedException("Job was cancelled before execution [taskSesId=" + + IgniteException e = new ComputeExecutionRejectedException("Job was cancelled before execution [taskSesId=" + job.getSession().getId() + ", jobId=" + job.getJobId() + ", job=" + job.getJob() + ']'); job.finishJob(null, e, sndReply); @@ -1010,8 +1010,8 @@ public class GridJobProcessor extends GridProcessorAdapter { jobCtx = new GridJobContextImpl(ctx, req.getJobId(), jobAttrs); } - catch (IgniteCheckedException e) { - IgniteCheckedException ex = new IgniteCheckedException("Failed to deserialize task attributes [taskName=" + + catch (IgniteException e) { + IgniteException ex = new IgniteException("Failed to deserialize task attributes [taskName=" + req.getTaskName() + ", taskClsName=" + req.getTaskClassName() + ", codeVer=" + req.getUserVersion() + ", taskClsLdr=" + dep.classLoader() + ']', e); @@ -1091,7 +1091,7 @@ public class GridJobProcessor extends GridProcessorAdapter { } else { // Deployment is null. - IgniteCheckedException ex = new GridDeploymentException("Task was not deployed or was redeployed since " + + IgniteException ex = new GridDeploymentException("Task was not deployed or was redeployed since " + "task execution [taskName=" + req.getTaskName() + ", taskClsName=" + req.getTaskClassName() + ", codeVer=" + req.getUserVersion() + ", clsLdrId=" + req.getClassLoaderId() + ", seqNum=" + req.getClassLoaderId().localId() + ", depMode=" + req.getDeploymentMode() + @@ -1174,7 +1174,7 @@ public class GridJobProcessor extends GridProcessorAdapter { // Even if job has been removed from another thread, we need to reject it // here since job has never been executed. - IgniteCheckedException e2 = new ComputeExecutionRejectedException( + IgniteException e2 = new ComputeExecutionRejectedException( "Job was cancelled before execution [jobSes=" + jobWorker. getSession() + ", job=" + jobWorker.getJob() + ']'); @@ -1222,7 +1222,7 @@ public class GridJobProcessor extends GridProcessorAdapter { // Even if job was removed from another thread, we need to reject it // here since job has never been executed. - IgniteCheckedException e2 = new ComputeExecutionRejectedException("Job has been rejected " + + IgniteException e2 = new ComputeExecutionRejectedException("Job has been rejected " + "[jobSes=" + jobWorker.getSession() + ", job=" + jobWorker.getJob() + ']', e); if (metricsUpdateFreq > -1L) @@ -1242,7 +1242,7 @@ public class GridJobProcessor extends GridProcessorAdapter { * @param ex Exception that happened. * @param endTime Job end time. */ - private void handleException(ClusterNode node, GridJobExecuteRequest req, IgniteCheckedException ex, long endTime) { + private void handleException(ClusterNode node, GridJobExecuteRequest req, IgniteException ex, long endTime) { UUID locNodeId = ctx.localNodeId(); ClusterNode sndNode = ctx.discovery().node(node.id()); @@ -1400,7 +1400,7 @@ public class GridJobProcessor extends GridProcessorAdapter { ses.setInternal(attrs); } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to deserialize session attributes.", e); } finally {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java index 9d100e3..27e6e98 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java @@ -365,7 +365,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { boolean initialize(GridDeployment dep, Class<?> taskCls) { assert dep != null; - IgniteCheckedException ex = null; + IgniteException ex = null; try { if (job == null) { @@ -381,7 +381,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { if (!internal && ctx.event().isRecordable(EVT_JOB_QUEUED)) recordEvent(EVT_JOB_QUEUED, "Job got queued for computation."); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to initialize job [jobId=" + ses.getJobId() + ", ses=" + ses + ']', e); ex = e; @@ -452,7 +452,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { Object res = null; - IgniteCheckedException ex = null; + IgniteException ex = null; try { ctx.job().currentTaskSession(ses); @@ -463,7 +463,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { sndRes = false; else { res = U.wrapThreadLoader(dep.classLoader(), new Callable<Object>() { - @Nullable @Override public Object call() throws IgniteCheckedException { + @Nullable @Override public Object call() { try { if (internal && ctx.config().isPeerClassLoadingEnabled()) ctx.job().internal(true); @@ -481,7 +481,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { log.debug("Job execution has successfully finished [job=" + job + ", res=" + res + ']'); } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { if (sysStopping && e.hasCause(GridInterruptedException.class, InterruptedException.class)) { ex = handleThrowable(e); @@ -530,10 +530,10 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { * @param e Exception. * @return Wrapped exception. */ - private IgniteCheckedException handleThrowable(Throwable e) { + private IgniteException handleThrowable(Throwable e) { String msg = null; - IgniteCheckedException ex = null; + IgniteException ex = null; // Special handling for weird interrupted exception which // happens due to JDk 1.5 bug. @@ -541,7 +541,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { msg = "Failed to execute job due to interrupted exception."; // Turn interrupted exception into checked exception. - ex = new IgniteCheckedException(msg, e); + ex = new IgniteException(msg, e); } // Special 'NoClassDefFoundError' handling if P2P is on. We had many questions // about this exception and decided to change error message. @@ -640,7 +640,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { * @param ex Error. * @param sndReply If {@code true}, reply will be sent. */ - void finishJob(@Nullable Object res, @Nullable IgniteCheckedException ex, boolean sndReply) { + void finishJob(@Nullable Object res, @Nullable IgniteException ex, boolean sndReply) { // Avoid finishing a job more than once from different threads. if (!finishing.compareAndSet(false, true)) return; @@ -811,7 +811,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { log.debug("Successfully executed GridComputeJobMasterLeaveAware.onMasterNodeLeft() callback " + "[nodeId=" + taskNode.id() + ", jobId=" + ses.getJobId() + ", job=" + job + ']'); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to execute GridComputeJobMasterLeaveAware.onMasterNodeLeft() callback " + "[nodeId=" + taskNode.id() + ", jobId=" + ses.getJobId() + ", job=" + job + ']', e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java index ae20c07..3d5deee 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java @@ -100,7 +100,7 @@ public class GridRestProcessor extends GridProcessorAdapter { try { fut.onDone(f.get()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { fut.onDone(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestNioListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestNioListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestNioListener.java index f80ab41..9b426a6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestNioListener.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestNioListener.java @@ -192,7 +192,7 @@ public class GridTcpRestNioListener extends GridNioServerListenerAdapter<GridCli res.result(o); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to process client request: " + msg, e); res.successStatus(GridClientResponse.STATUS_FAILED); @@ -263,7 +263,7 @@ public class GridTcpRestNioListener extends GridNioServerListenerAdapter<GridCli Map vals = req.values(); if (vals != null) - restCacheReq.values(new HashMap<Object, Object>(vals)); + restCacheReq.values(new HashMap<>(vals)); restCacheReq.command(cacheCmdMap.get(req.operation())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java index 46ecf48..6294239 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java @@ -166,7 +166,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { if (cfgQry != null) cfgQry.close(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { log.error("Failed to unsubscribe service configuration notifications.", e); } @@ -174,7 +174,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { if (assignQry != null) assignQry.close(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { log.error("Failed to unsubscribe service assignment notifications.", e); } @@ -999,7 +999,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { if (newTopVer == topVer) reassign(dep, topVer); } - catch (IgniteCheckedException e) { + catch (IgniteException | IgniteCheckedException e) { if (!(e instanceof ClusterTopologyException)) log.error("Failed to do service reassignment (will retry): " + dep.configuration().getName(), e); @@ -1149,7 +1149,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { it.remove(); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { if (!(e instanceof ClusterTopologyException)) LT.error(log, e, "Failed to do service reassignment (will retry): " + dep.configuration().getName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerContextDelegate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerContextDelegate.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerContextDelegate.java index 6e236ea..0e2371b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerContextDelegate.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerContextDelegate.java @@ -63,36 +63,36 @@ public class GridStreamerContextDelegate implements StreamerContext { } /** {@inheritDoc} */ - @Override public <R> Collection<R> query(IgniteClosure<StreamerContext, R> clo) throws IgniteCheckedException { + @Override public <R> Collection<R> query(IgniteClosure<StreamerContext, R> clo) throws IgniteException { return delegate.query(clo); } /** {@inheritDoc} */ @Override public <R> Collection<R> query(IgniteClosure<StreamerContext, R> clo, Collection<ClusterNode> nodes) - throws IgniteCheckedException { + throws IgniteException { return delegate.query(clo, nodes); } /** {@inheritDoc} */ - @Override public void broadcast(IgniteInClosure<StreamerContext> clo) throws IgniteCheckedException { + @Override public void broadcast(IgniteInClosure<StreamerContext> clo) throws IgniteException { delegate.broadcast(clo); } /** {@inheritDoc} */ @Override public void broadcast(IgniteInClosure<StreamerContext> clo, Collection<ClusterNode> nodes) - throws IgniteCheckedException { + throws IgniteException { delegate.broadcast(clo, nodes); } /** {@inheritDoc} */ @Override public <R1, R2> R2 reduce(IgniteClosure<StreamerContext, R1> clo, IgniteReducer<R1, R2> rdc) - throws IgniteCheckedException { + throws IgniteException { return delegate.reduce(clo, rdc); } /** {@inheritDoc} */ @Override public <R1, R2> R2 reduce(IgniteClosure<StreamerContext, R1> clo, IgniteReducer<R1, R2> rdc, - Collection<ClusterNode> nodes) throws IgniteCheckedException { + Collection<ClusterNode> nodes) throws IgniteException { return delegate.reduce(clo, rdc, nodes); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerContextImpl.java index e116720..99aa4d2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerContextImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerContextImpl.java @@ -103,13 +103,13 @@ public class GridStreamerContextImpl implements StreamerContext { } /** {@inheritDoc} */ - @Override public <R> Collection<R> query(IgniteClosure<StreamerContext, R> clo) throws IgniteCheckedException { + @Override public <R> Collection<R> query(IgniteClosure<StreamerContext, R> clo) throws IgniteException { return query(clo, Collections.<ClusterNode>emptyList()); } /** {@inheritDoc} */ @Override public <R> Collection<R> query(IgniteClosure<StreamerContext, R> clo, Collection<ClusterNode> nodes) - throws IgniteCheckedException { + throws IgniteException { ctx.gateway().readLock(); try { @@ -132,13 +132,13 @@ public class GridStreamerContextImpl implements StreamerContext { } /** {@inheritDoc} */ - @Override public void broadcast(IgniteInClosure<StreamerContext> clo) throws IgniteCheckedException { + @Override public void broadcast(IgniteInClosure<StreamerContext> clo) throws IgniteException { broadcast(clo, Collections.<ClusterNode>emptyList()); } /** {@inheritDoc} */ @Override public void broadcast(IgniteInClosure<StreamerContext> clo, Collection<ClusterNode> nodes) - throws IgniteCheckedException { + throws IgniteException { ctx.gateway().readLock(); try { @@ -156,13 +156,13 @@ public class GridStreamerContextImpl implements StreamerContext { /** {@inheritDoc} */ @Override public <R1, R2> R2 reduce(IgniteClosure<StreamerContext, R1> clo, IgniteReducer<R1, R2> rdc) - throws IgniteCheckedException { + throws IgniteException { return reduce(clo, rdc, Collections.<ClusterNode>emptyList()); } /** {@inheritDoc} */ @Override public <R1, R2> R2 reduce(IgniteClosure<StreamerContext, R1> clo, IgniteReducer<R1, R2> rdc, - Collection<ClusterNode> nodes) throws IgniteCheckedException { + Collection<ClusterNode> nodes) throws IgniteException { ctx.gateway().readLock(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerStageExecutionFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerStageExecutionFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerStageExecutionFuture.java index 7b559e3..a74c361 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerStageExecutionFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerStageExecutionFuture.java @@ -336,7 +336,7 @@ public class GridStreamerStageExecutionFuture extends GridFutureAdapter<Object> } /** {@inheritDoc} */ - @Override public boolean cancel() throws IgniteCheckedException { + @Override public boolean cancel() throws IgniteException { if (!onCancelled()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java index c18a154..3886d4c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java @@ -325,7 +325,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { try { execFut.cancel(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.warn(log, "Failed to cancel batch execution future on node stop (will ignore) " + "[execFut=" + execFut + ", err=" + e + ']'); } @@ -342,7 +342,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { fut.get(); } } - catch (IgniteCheckedException ignore) { + catch (IgniteException ignore) { // For failed futures callback will be executed, no need to care about this exception here. } } @@ -351,7 +351,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { try { execFut.get(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { if (!e.hasCause(GridInterruptedException.class)) U.warn(log, "Failed to wait for batch execution future completion (will ignore) " + "[execFut=" + execFut + ", e=" + e + ']'); @@ -411,7 +411,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { } /** {@inheritDoc} */ - @Override public void addEvent(Object evt, Object... evts) throws IgniteCheckedException { + @Override public void addEvent(Object evt, Object... evts) throws IgniteException { A.notNull(evt, "evt"); if (!F.isEmpty(evts)) @@ -421,7 +421,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { } /** {@inheritDoc} */ - @Override public void addEventToStage(String stageName, Object evt, Object... evts) throws IgniteCheckedException { + @Override public void addEventToStage(String stageName, Object evt, Object... evts) throws IgniteException { A.notNull(stageName, "stageName"); A.notNull(evt, "evt"); @@ -432,14 +432,14 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { } /** {@inheritDoc} */ - @Override public void addEvents(Collection<?> evts) throws IgniteCheckedException { + @Override public void addEvents(Collection<?> evts) throws IgniteException { A.ensure(!F.isEmpty(evts), "evts cannot be null or empty"); addEventsToStage(firstStage, evts); } /** {@inheritDoc} */ - @Override public void addEventsToStage(String stageName, Collection<?> evts) throws IgniteCheckedException { + @Override public void addEventsToStage(String stageName, Collection<?> evts) throws IgniteException { A.notNull(stageName, "stageName"); A.ensure(!F.isEmpty(evts), "evts cannot be empty or null"); @@ -846,7 +846,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { try { batchFut.cancel(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { log.warning("Failed to cancel batch execution future [cancelledFutId=" + cancelledFutId + ", batchFut=" + batchFut + ']', e); } @@ -964,7 +964,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { try { err = ctx.config().getMarshaller().unmarshal(res.errorBytes(), null); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to unmarshal response.", e); } } @@ -1380,7 +1380,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { } /** {@inheritDoc} */ - @Override public boolean cancel() throws IgniteCheckedException { + @Override public boolean cancel() throws IgniteException { assert w != null; if (!super.cancel()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/StreamerStageWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/StreamerStageWrapper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/StreamerStageWrapper.java index fa72709..bf4c6cc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/StreamerStageWrapper.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/StreamerStageWrapper.java @@ -66,7 +66,7 @@ public class StreamerStageWrapper implements StreamerStage<Object> { /** {@inheritDoc} */ @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection<Object> evts) - throws IgniteCheckedException { + throws IgniteException { return delegate.run(ctx, evts); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerBroadcastTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerBroadcastTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerBroadcastTask.java index fb29ccd..7747d9b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerBroadcastTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerBroadcastTask.java @@ -49,7 +49,7 @@ public class GridStreamerBroadcastTask extends GridPeerDeployAwareTaskAdapter<Vo /** {@inheritDoc} */ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Void arg) - throws IgniteCheckedException { + throws IgniteException { Map<ComputeJob, ClusterNode> res = U.newHashMap(subgrid.size()); for (ClusterNode node : subgrid) @@ -59,12 +59,12 @@ public class GridStreamerBroadcastTask extends GridPeerDeployAwareTaskAdapter<Vo } /** {@inheritDoc} */ - @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException { + @Override public Void reduce(List<ComputeJobResult> results) throws IgniteException { return null; } /** {@inheritDoc} */ - @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException { + @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteException { // No failover. if (res.getException() != null) throw res.getException(); @@ -106,7 +106,7 @@ public class GridStreamerBroadcastTask extends GridPeerDeployAwareTaskAdapter<Vo } /** {@inheritDoc} */ - @Override public Object execute() throws IgniteCheckedException { + @Override public Object execute() throws IgniteException { IgniteStreamer s = g.streamer(streamer); assert s != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerQueryTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerQueryTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerQueryTask.java index bdb59d9..cb9c034 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerQueryTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerQueryTask.java @@ -49,7 +49,7 @@ public class GridStreamerQueryTask<R> extends GridPeerDeployAwareTaskAdapter<Voi /** {@inheritDoc} */ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Void arg) - throws IgniteCheckedException { + throws IgniteException { Map<ComputeJob, ClusterNode> res = U.newHashMap(subgrid.size()); for (ClusterNode node : subgrid) @@ -59,7 +59,7 @@ public class GridStreamerQueryTask<R> extends GridPeerDeployAwareTaskAdapter<Voi } /** {@inheritDoc} */ - @Override public Collection<R> reduce(List<ComputeJobResult> results) throws IgniteCheckedException { + @Override public Collection<R> reduce(List<ComputeJobResult> results) throws IgniteException { Collection<R> res = new ArrayList<>(results.size()); for (ComputeJobResult jobRes : results) @@ -69,7 +69,7 @@ public class GridStreamerQueryTask<R> extends GridPeerDeployAwareTaskAdapter<Voi } /** {@inheritDoc} */ - @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException { + @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteException { // No failover for this task. if (res.getException() != null) throw res.getException(); @@ -111,7 +111,7 @@ public class GridStreamerQueryTask<R> extends GridPeerDeployAwareTaskAdapter<Voi } /** {@inheritDoc} */ - @Override public Object execute() throws IgniteCheckedException { + @Override public Object execute() throws IgniteException { IgniteStreamer s = g.streamer(streamer); assert s != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerReduceTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerReduceTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerReduceTask.java index 6732e02..48f3621 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerReduceTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/task/GridStreamerReduceTask.java @@ -56,7 +56,7 @@ public class GridStreamerReduceTask<R1, R2> extends GridPeerDeployAwareTaskAdapt /** {@inheritDoc} */ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Void arg) - throws IgniteCheckedException { + throws IgniteException { Map<ComputeJob, ClusterNode> res = U.newHashMap(subgrid.size()); for (ClusterNode node : subgrid) @@ -66,12 +66,12 @@ public class GridStreamerReduceTask<R1, R2> extends GridPeerDeployAwareTaskAdapt } /** {@inheritDoc} */ - @Override public R2 reduce(List<ComputeJobResult> results) throws IgniteCheckedException { + @Override public R2 reduce(List<ComputeJobResult> results) throws IgniteException { return rdc.reduce(); } /** {@inheritDoc} */ - @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException { + @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteException { // No failover for this task. if (res.getException() != null) throw res.getException(); @@ -115,7 +115,7 @@ public class GridStreamerReduceTask<R1, R2> extends GridPeerDeployAwareTaskAdapt } /** {@inheritDoc} */ - @Override public Object execute() throws IgniteCheckedException { + @Override public Object execute() throws IgniteException { IgniteStreamer s = g.streamer(streamer); assert s != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java index d05d5ba..404faa1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java @@ -132,7 +132,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { catch (ComputeTaskCancelledException e) { U.warn(log, e.getMessage()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Task failed: " + task, e); } } @@ -1109,7 +1109,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { ctx.io().removeMessageListener(s.taskTopic(), msgLsnr); } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to unregister job communication message listeners and counters.", e); } } @@ -1203,7 +1203,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { try { siblings = worker.getSession().getJobSiblings(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to get job siblings [request=" + msg + ", ses=" + worker.getSession() + ']', e); @@ -1275,7 +1275,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { try { gridTaskWorker.getTaskFuture().cancel(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { log.warning("Failed to cancel task: " + gridTaskWorker.getTask(), e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java index e89502f..b221308 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java @@ -17,7 +17,6 @@ import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.job.*; @@ -132,7 +131,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { /** Continuous mapper. */ private final ComputeTaskContinuousMapper mapper = new ComputeTaskContinuousMapper() { /** {@inheritDoc} */ - @Override public void send(ComputeJob job, ClusterNode node) throws IgniteCheckedException { + @Override public void send(ComputeJob job, ClusterNode node) throws IgniteException { A.notNull(job, "job"); A.notNull(node, "node"); @@ -140,31 +139,31 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { } /** {@inheritDoc} */ - @Override public void send(Map<? extends ComputeJob, ClusterNode> mappedJobs) throws IgniteCheckedException { + @Override public void send(Map<? extends ComputeJob, ClusterNode> mappedJobs) throws IgniteException { A.notNull(mappedJobs, "mappedJobs"); processMappedJobs(mappedJobs); } /** {@inheritDoc} */ - @Override public void send(ComputeJob job) throws IgniteCheckedException { + @Override public void send(ComputeJob job) throws IgniteException { A.notNull(job, "job"); send(Collections.singleton(job)); } /** {@inheritDoc} */ - @Override public void send(Collection<? extends ComputeJob> jobs) throws IgniteCheckedException { + @Override public void send(Collection<? extends ComputeJob> jobs) throws IgniteException { A.notNull(jobs, "jobs"); if (jobs.isEmpty()) - throw new IgniteCheckedException("Empty jobs collection passed to send(...) method."); + throw new IgniteException("Empty jobs collection passed to send(...) method."); ComputeLoadBalancer balancer = ctx.loadBalancing().getLoadBalancer(ses, getTaskTopology()); for (ComputeJob job : jobs) { if (job == null) - throw new IgniteCheckedException("Null job passed to send(...) method."); + throw new IgniteException("Null job passed to send(...) method."); processMappedJobs(Collections.singletonMap(job, balancer.getBalancedNode(job, null))); } @@ -354,7 +353,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { try { task = newTask((Class<? extends ComputeTask<T, R>>)taskCls); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { // If cannot instantiate task, then assign internal flag based // on information available. internal = dep.internalTask(null, taskCls); @@ -388,7 +387,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { Map<? extends ComputeJob, ClusterNode> mappedJobs = U.wrapThreadLoader(dep.classLoader(), new Callable<Map<? extends ComputeJob, ClusterNode>>() { - @Override public Map<? extends ComputeJob, ClusterNode> call() throws IgniteCheckedException { + @Override public Map<? extends ComputeJob, ClusterNode> call() throws IgniteException { return task.map(shuffledNodes, arg); } }); @@ -440,9 +439,9 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { /** * @param jobs Map of jobs. - * @throws IgniteCheckedException Thrown in case of any error. + * @throws IgniteException Thrown in case of any error. */ - private void processMappedJobs(Map<? extends ComputeJob, ClusterNode> jobs) throws IgniteCheckedException { + private void processMappedJobs(Map<? extends ComputeJob, ClusterNode> jobs) throws IgniteException { if (F.isEmpty(jobs)) return; @@ -456,10 +455,10 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { ClusterNode node = mappedJob.getValue(); if (job == null) - throw new IgniteCheckedException("Job can not be null [mappedJob=" + mappedJob + ", ses=" + ses + ']'); + throw new IgniteException("Job can not be null [mappedJob=" + mappedJob + ", ses=" + ses + ']'); if (node == null) - throw new IgniteCheckedException("Node can not be null [mappedJob=" + mappedJob + ", ses=" + ses + ']'); + throw new IgniteException("Node can not be null [mappedJob=" + mappedJob + ", ses=" + ses + ']'); IgniteUuid jobId = IgniteUuid.fromUuid(node.id()); @@ -476,7 +475,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { synchronized (mux) { if (state != State.WAITING) - throw new IgniteCheckedException("Task is not in waiting state [state=" + state + ", ses=" + ses + ']'); + throw new IgniteException("Task is not in waiting state [state=" + state + ", ses=" + ses + ']'); // Do not add siblings if result cache is disabled. if (resCache) @@ -490,7 +489,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { // getting results while still sending out references. for (GridJobResultImpl res : jobResList) { if (jobRes.put(res.getJobContext().getJobId(), res) != null) - throw new IgniteCheckedException("Duplicate job ID for remote job found: " + res.getJobContext().getJobId()); + throw new IgniteException("Duplicate job ID for remote job found: " + res.getJobContext().getJobId()); res.setOccupied(true); @@ -524,9 +523,9 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { /** * @return Topology for this task. - * @throws IgniteCheckedException Thrown in case of any error. + * @throws IgniteException Thrown in case of any error. */ - private List<ClusterNode> getTaskTopology() throws IgniteCheckedException { + private List<ClusterNode> getTaskTopology() throws IgniteException { Collection<UUID> top = ses.getTopology(); Collection<? extends ClusterNode> subgrid = top != null ? ctx.discovery().nodes(top) : ctx.discovery().allNodes(); @@ -664,8 +663,8 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { Object res0 = loc ? res.getJobResult() : marsh.unmarshal(res.getJobResultBytes(), clsLdr); - IgniteCheckedException ex = loc ? res.getException() : - marsh.<IgniteCheckedException>unmarshal(res.getExceptionBytes(), clsLdr); + IgniteException ex = loc ? res.getException() : + marsh.<IgniteException>unmarshal(res.getExceptionBytes(), clsLdr); Map<Object, Object> attrs = loc ? res.getJobAttributes() : marsh.<Map<Object, Object>>unmarshal(res.getJobAttributesBytes(), clsLdr); @@ -762,7 +761,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { } } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to obtain topology [ses=" + ses + ", err=" + e + ']', e); finishTask(null, e); @@ -806,7 +805,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { plc = task.result(jobRes, results); if (plc == FAILOVER && noFailover) { - IgniteCheckedException e = jobRes.getException(); + IgniteException e = jobRes.getException(); if (e != null) throw e; @@ -824,31 +823,6 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { return plc; } - catch (IgniteCheckedException e) { - if (X.hasCause(e, GridInternalException.class) || - X.hasCause(e, IgniteFsOutOfSpaceException.class)) { - // Print internal exceptions only if debug is enabled. - if (log.isDebugEnabled()) - U.error(log, "Failed to obtain remote job result policy for result from " + - "GridComputeTask.result(..) method (will fail the whole task): " + jobRes, e); - } - else if (X.hasCause(e, ComputeJobFailoverException.class)) { - IgniteCheckedException e0 = new IgniteCheckedException(" Job was not failed over because " + - "GridComputeJobResultPolicy.FAILOVER was not returned from " + - "GridTask.result(...) method for job result with GridComputeJobFailoverException.", e); - - finishTask(null, e0); - - return null; - } - else - U.error(log, "Failed to obtain remote job result policy for result from " + - "GridComputeTask.result(..) method (will fail the whole task): " + jobRes, e); - - finishTask(null, e); - - return null; - } catch (IgniteException e) { if (X.hasCause(e, GridInternalException.class) || X.hasCause(e, IgniteFsOutOfSpaceException.class)) { @@ -867,7 +841,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { return null; } else - U.error(log, "Failed to obtain remote job result policy for result from" + + U.error(log, "Failed to obtain remote job result policy for result from " + "GridComputeTask.result(..) method (will fail the whole task): " + jobRes, e); finishTask(null, e); @@ -904,7 +878,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { try { // Reduce results. reduceRes = U.wrapThreadLoader(dep.classLoader(), new Callable<R>() { - @Nullable @Override public R call() throws IgniteCheckedException { + @Nullable @Override public R call() throws IgniteException { return task.reduce(results); } }); @@ -927,7 +901,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { userE = e; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to reduce job results for task: " + task, e); userE = e; @@ -1182,7 +1156,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { U.warn(log, "Job timed out prior to sending job execution request: " + res.getJob()); } } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { boolean deadNode = isDeadNode(res.getNode().id()); // Avoid stack trace if node has left grid. @@ -1200,7 +1174,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { fakeRes.setFakeException(new ClusterTopologyException("Failed to send job due to node failure: " + node, e)); else - fakeRes.setFakeException(e); + fakeRes.setFakeException(U.wrap(e)); onResponse(fakeRes); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java index dc093ca..120b783 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java @@ -43,7 +43,7 @@ public abstract class VisorJob<A, R> extends ComputeJobAdapter { } /** {@inheritDoc} */ - @Nullable @Override public Object execute() throws IgniteCheckedException { + @Nullable @Override public Object execute() throws IgniteException { start = U.currentTimeMillis(); A arg = argument(0); @@ -52,7 +52,12 @@ public abstract class VisorJob<A, R> extends ComputeJobAdapter { if (debug) logStart(g.log(), getClass(), start); - return run(arg); + try { + return run(arg); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } finally { if (debug) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java index 802d409..f5756ea 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java @@ -48,7 +48,7 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa /** {@inheritDoc} */ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, VisorTaskArgument<A> arg) - throws IgniteCheckedException { + throws IgniteException { assert arg != null; start = U.currentTimeMillis(); @@ -69,10 +69,10 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa * @param arg Task execution argument. * @param subgrid Nodes available for this task execution. * @return Map of grid jobs assigned to subgrid node. - * @throws IgniteCheckedException If mapping could not complete successfully. + * @throws IgniteException If mapping could not complete successfully. */ protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid, VisorTaskArgument<A> arg) - throws IgniteCheckedException { + throws IgniteException { Collection<UUID> nodeIds = arg.nodes(); Map<ComputeJob, ClusterNode> map = U.newHashMap(nodeIds.size()); @@ -92,7 +92,7 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa /** {@inheritDoc} */ @Override public ComputeJobResultPolicy result(ComputeJobResult res, - List<ComputeJobResult> rcvd) throws IgniteCheckedException { + List<ComputeJobResult> rcvd) throws IgniteException { // All Visor tasks should handle exceptions in reduce method. return ComputeJobResultPolicy.WAIT; } @@ -102,12 +102,12 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa * * @param results Job results. * @return Task result. - * @throws IgniteCheckedException If reduction or results caused an error. + * @throws IgniteException If reduction or results caused an error. */ - @Nullable protected abstract R reduce0(List<ComputeJobResult> results) throws IgniteCheckedException; + @Nullable protected abstract R reduce0(List<ComputeJobResult> results) throws IgniteException; /** {@inheritDoc} */ - @Nullable @Override public final R reduce(List<ComputeJobResult> results) throws IgniteCheckedException { + @Nullable @Override public final R reduce(List<ComputeJobResult> results) throws IgniteException { try { return reduce0(results); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorOneNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorOneNodeTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorOneNodeTask.java index 7a46cac..3b76b23 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorOneNodeTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorOneNodeTask.java @@ -21,7 +21,7 @@ import java.util.*; */ public abstract class VisorOneNodeTask<A, R> extends VisorMultiNodeTask<A, R, R> { /** {@inheritDoc} */ - @Nullable @Override protected R reduce0(List<ComputeJobResult> results) throws IgniteCheckedException { + @Nullable @Override protected R reduce0(List<ComputeJobResult> results) throws IgniteException { assert results.size() == 1; ComputeJobResult res = F.first(results); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java index cd92579..ab24d86 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java @@ -39,7 +39,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT /** {@inheritDoc} */ @Nullable @Override protected Iterable<VisorCacheAggregatedMetrics> reduce0(List<ComputeJobResult> results) - throws IgniteCheckedException { + throws IgniteException { Map<String, VisorCacheAggregatedMetrics> grpAggrMetrics = new HashMap<>(); for (ComputeJobResult res : results) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeCancelSessionsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeCancelSessionsTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeCancelSessionsTask.java index faeddeb..ed93efa 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeCancelSessionsTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeCancelSessionsTask.java @@ -34,7 +34,7 @@ public class VisorComputeCancelSessionsTask extends VisorMultiNodeTask<Map<UUID, } /** {@inheritDoc} */ - @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteCheckedException { + @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteException { // No-op, just awaiting all jobs done. return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeToggleMonitoringTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeToggleMonitoringTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeToggleMonitoringTask.java index 7535fa1..8e7aec9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeToggleMonitoringTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeToggleMonitoringTask.java @@ -33,7 +33,7 @@ public class VisorComputeToggleMonitoringTask extends private static final long serialVersionUID = 0L; /** {@inheritDoc} */ - @Nullable @Override protected Boolean reduce0(List<ComputeJobResult> results) throws IgniteCheckedException { + @Nullable @Override protected Boolean reduce0(List<ComputeJobResult> results) throws IgniteException { Collection<Boolean> toggles = new HashSet<>(); for (ComputeJobResult res: results) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/log/VisorLogSearchTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/log/VisorLogSearchTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/log/VisorLogSearchTask.java index 865f6ef..2d0bccb 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/log/VisorLogSearchTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/log/VisorLogSearchTask.java @@ -50,7 +50,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchTask.Vi /** {@inheritDoc} */ @Nullable @Override protected IgniteBiTuple<Iterable<IgniteBiTuple<Exception, UUID>>, - Iterable<VisorLogSearchResult>> reduce0(List<ComputeJobResult> results) throws IgniteCheckedException { + Iterable<VisorLogSearchResult>> reduce0(List<ComputeJobResult> results) throws IgniteException { Collection<VisorLogSearchResult> searchRes = new ArrayList<>(); Collection<IgniteBiTuple<Exception, UUID>> exRes = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorAckTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorAckTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorAckTask.java index 102cd28..c8c30fb 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorAckTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorAckTask.java @@ -32,7 +32,7 @@ public class VisorAckTask extends VisorMultiNodeTask<String, Void, Void> { } /** {@inheritDoc} */ - @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteCheckedException { + @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteException { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorNopTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorNopTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorNopTask.java index cea6f5a..f61db74 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorNopTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorNopTask.java @@ -27,7 +27,7 @@ public class VisorNopTask implements ComputeTask<Integer, Void> { /** {@inheritDoc} */ @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, - @Nullable Integer arg) throws IgniteCheckedException { + @Nullable Integer arg) throws IgniteException { Map<ComputeJob, ClusterNode> map = new GridLeanMap<>(subgrid.size()); @@ -39,12 +39,12 @@ public class VisorNopTask implements ComputeTask<Integer, Void> { /** {@inheritDoc} */ @Override public ComputeJobResultPolicy result(ComputeJobResult res, - List<ComputeJobResult> rcvd) throws IgniteCheckedException { + List<ComputeJobResult> rcvd) throws IgniteException { return ComputeJobResultPolicy.WAIT; } /** {@inheritDoc} */ - @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException { + @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteException { return null; } @@ -61,7 +61,7 @@ public class VisorNopTask implements ComputeTask<Integer, Void> { /** {@inheritDoc} */ @SuppressWarnings("ConstantConditions") - @Nullable @Override public Object execute() throws IgniteCheckedException { + @Nullable @Override public Object execute() throws IgniteException { try { Integer maxTimeout = argument(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java index dc4ff6c..af8534a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java @@ -32,7 +32,7 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData /** {@inheritDoc} */ @Override protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid, - VisorTaskArgument<VisorNodeDataCollectorTaskArg> arg) throws IgniteCheckedException { + VisorTaskArgument<VisorNodeDataCollectorTaskArg> arg) throws IgniteException { assert arg != null; Map<ComputeJob, ClusterNode> map = U.newHashMap(subgrid.size()); @@ -54,19 +54,19 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData } /** {@inheritDoc} */ - @Nullable @Override protected VisorNodeDataCollectorTaskResult reduce0(List<ComputeJobResult> results) throws IgniteCheckedException { + @Nullable @Override protected VisorNodeDataCollectorTaskResult reduce0(List<ComputeJobResult> results) throws IgniteException { return reduce(new VisorNodeDataCollectorTaskResult(), results); } protected VisorNodeDataCollectorTaskResult reduce(VisorNodeDataCollectorTaskResult taskResult, - List<ComputeJobResult> results) throws IgniteCheckedException { + List<ComputeJobResult> results) throws IgniteException { for (ComputeJobResult res : results) { VisorNodeDataCollectorJobResult jobResult = res.getData(); if (jobResult != null) { UUID nid = res.getNode().id(); - IgniteCheckedException unhandledEx = res.getException(); + IgniteException unhandledEx = res.getException(); if (unhandledEx == null) reduceJobResult(taskResult, jobResult, nid); @@ -82,7 +82,7 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData } protected void reduceJobResult(VisorNodeDataCollectorTaskResult taskResult, - VisorNodeDataCollectorJobResult jobResult, UUID nid) throws IgniteCheckedException { + VisorNodeDataCollectorJobResult jobResult, UUID nid) throws IgniteException { taskResult.gridNames().put(nid, jobResult.gridName()); taskResult.topologyVersions().put(nid, jobResult.topologyVersion()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeEventsCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeEventsCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeEventsCollectorTask.java index 2e4ab21..9dafc56 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeEventsCollectorTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeEventsCollectorTask.java @@ -43,7 +43,7 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv /** {@inheritDoc} */ @Override protected Iterable<? extends VisorGridEvent> reduce0( - List<ComputeJobResult> results) throws IgniteCheckedException { + List<ComputeJobResult> results) throws IgniteException { Collection<VisorGridEvent> allEvents = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java index 6e144cc..16eef24 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java @@ -36,7 +36,7 @@ public class VisorNodeGcTask extends VisorMultiNodeTask<Void, Map<UUID, IgniteBi /** {@inheritDoc} */ @Nullable @Override protected Map<UUID, IgniteBiTuple<Long, Long>> reduce0(List<ComputeJobResult> results) - throws IgniteCheckedException { + throws IgniteException { Map<UUID, IgniteBiTuple<Long, Long>> total = new HashMap<>(); for (ComputeJobResult res: results) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java index 9905131..c82ef8b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java @@ -34,7 +34,7 @@ public class VisorNodePingTask extends VisorOneNodeTask<UUID, GridTuple3<Boolean } /** {@inheritDoc} */ - @Nullable @Override protected GridTuple3<Boolean, Long, Long> reduce0(List<ComputeJobResult> results) throws IgniteCheckedException { + @Nullable @Override protected GridTuple3<Boolean, Long, Long> reduce0(List<ComputeJobResult> results) throws IgniteException { try { return super.reduce0(results); } @@ -59,7 +59,7 @@ public class VisorNodePingTask extends VisorOneNodeTask<UUID, GridTuple3<Boolean } /** {@inheritDoc} */ - @Override protected GridTuple3<Boolean, Long, Long> run(UUID nodeToPing) throws IgniteCheckedException { + @Override protected GridTuple3<Boolean, Long, Long> run(UUID nodeToPing) throws IgniteException { long start = System.currentTimeMillis(); return new GridTuple3<>(g.pingNode(nodeToPing), start, System.currentTimeMillis()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeRestartTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeRestartTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeRestartTask.java index d4ce281..01d9a2d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeRestartTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeRestartTask.java @@ -28,7 +28,7 @@ public class VisorNodeRestartTask extends VisorMultiNodeTask<Void, Void, Void> { private static final long serialVersionUID = 0L; /** {@inheritDoc} */ - @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteCheckedException { + @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteException { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeStopTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeStopTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeStopTask.java index 5415bc5..2058446 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeStopTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeStopTask.java @@ -33,7 +33,7 @@ public class VisorNodeStopTask extends VisorMultiNodeTask<Void, Void, Void> { } /** {@inheritDoc} */ - @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteCheckedException { + @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteException { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryCleanupTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryCleanupTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryCleanupTask.java index ca6834d..de48be4 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryCleanupTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryCleanupTask.java @@ -36,7 +36,7 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID, Collecti /** {@inheritDoc} */ @Override protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid, - @Nullable VisorTaskArgument<Map<UUID, Collection<String>>> arg) throws IgniteCheckedException { + @Nullable VisorTaskArgument<Map<UUID, Collection<String>>> arg) throws IgniteException { Set<UUID> nodeIds = taskArg.keySet(); Map<ComputeJob, ClusterNode> map = U.newHashMap(nodeIds.size()); @@ -55,7 +55,7 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID, Collecti } /** {@inheritDoc} */ - @Nullable @Override protected Void reduce0(List list) throws IgniteCheckedException { + @Nullable @Override protected Void reduce0(List list) throws IgniteException { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapter.java index 2a88959..0a5a94e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapter.java @@ -68,7 +68,7 @@ public abstract class GridCloseableIteratorAdapter<T> extends GridIteratorAdapte } /** {@inheritDoc} */ - @Override public final void close() throws IgniteCheckedException { + @Override public final void close() throws IgniteException { if (!closed) { onClose(); @@ -84,9 +84,9 @@ public abstract class GridCloseableIteratorAdapter<T> extends GridIteratorAdapte /** * Invoked on iterator close. * - * @throws IgniteCheckedException If closing failed. + * @throws IgniteException If closing failed. */ - protected void onClose() throws IgniteCheckedException { + protected void onClose() throws IgniteException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapterEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapterEx.java b/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapterEx.java index d53f3ce..9d3f633 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapterEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapterEx.java @@ -98,7 +98,7 @@ public abstract class GridCloseableIteratorAdapterEx<T> extends GridIteratorAdap } /** {@inheritDoc} */ - @Override public final void close() throws IgniteCheckedException { + @Override public final void close() throws IgniteException { if (closed.compareAndSet(false, true)) onClose(); } @@ -106,9 +106,9 @@ public abstract class GridCloseableIteratorAdapterEx<T> extends GridIteratorAdap /** * Invoked on iterator close. * - * @throws IgniteCheckedException If closing failed. + * @throws IgniteException If closing failed. */ - protected void onClose() throws IgniteCheckedException { + protected void onClose() throws IgniteException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/util/GridEmptyCloseableIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridEmptyCloseableIterator.java b/modules/core/src/main/java/org/gridgain/grid/util/GridEmptyCloseableIterator.java index 09ecf94..c32befb 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/GridEmptyCloseableIterator.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/GridEmptyCloseableIterator.java @@ -23,7 +23,7 @@ public class GridEmptyCloseableIterator<T> extends GridEmptyIterator<T> implemen private boolean closed; /** {@inheritDoc} */ - @Override public void close() throws IgniteCheckedException { + @Override public void close() throws IgniteException { closed = true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/util/GridSpiCloseableIteratorWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridSpiCloseableIteratorWrapper.java b/modules/core/src/main/java/org/gridgain/grid/util/GridSpiCloseableIteratorWrapper.java index b4f0bb6..dc51059 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/GridSpiCloseableIteratorWrapper.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/GridSpiCloseableIteratorWrapper.java @@ -43,7 +43,7 @@ public class GridSpiCloseableIteratorWrapper<T> extends GridCloseableIteratorAda } /** {@inheritDoc} */ - @Override protected void onClose() throws IgniteCheckedException { + @Override protected void onClose() throws IgniteException { iter.close(); } }
