You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/12 10:29:04 UTC
[03/67] [abbrv] [partial] incubator-ignite git commit: Rename
GridException to IgniteCheckedException,
GridRuntimeException to IgniteException.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimap.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimap.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimap.java
index 1145406..6265a99 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimap.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimap.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.shuffle.collections;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.util.*;
@@ -79,7 +80,7 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
* @return Adder object.
* @param ctx Task context.
*/
- @Override public Adder startAdding(GridHadoopTaskContext ctx) throws GridException {
+ @Override public Adder startAdding(GridHadoopTaskContext ctx) throws IgniteCheckedException {
if (inputs.get() != 0)
throw new IllegalStateException("Active inputs.");
@@ -114,7 +115,7 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
* @param v Visitor.
* @return {@code false} If visiting was impossible due to rehashing.
*/
- @Override public boolean visit(boolean ignoreLastVisited, Visitor v) throws GridException {
+ @Override public boolean visit(boolean ignoreLastVisited, Visitor v) throws IgniteCheckedException {
if (!state.compareAndSet(State.READING_WRITING, State.VISITING)) {
assert state.get() != State.CLOSING;
@@ -154,7 +155,7 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
}
/** {@inheritDoc} */
- @Override public GridHadoopTaskInput input(GridHadoopTaskContext taskCtx) throws GridException {
+ @Override public GridHadoopTaskInput input(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
inputs.incrementAndGet();
if (!adders.isEmpty())
@@ -168,7 +169,7 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
assert s != State.REHASHING;
return new Input(taskCtx) {
- @Override public void close() throws GridException {
+ @Override public void close() throws IgniteCheckedException {
if (inputs.decrementAndGet() < 0)
throw new IllegalStateException();
@@ -359,9 +360,9 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
/**
* @param ctx Task context.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private AdderImpl(GridHadoopTaskContext ctx) throws GridException {
+ private AdderImpl(GridHadoopTaskContext ctx) throws IgniteCheckedException {
super(ctx);
keyReader = new Reader(keySer);
@@ -375,9 +376,9 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
* @param in Data input.
* @param reuse Reusable key.
* @return Key.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- @Override public Key addKey(DataInput in, @Nullable Key reuse) throws GridException {
+ @Override public Key addKey(DataInput in, @Nullable Key reuse) throws IgniteCheckedException {
KeyImpl k = reuse == null ? new KeyImpl() : (KeyImpl)reuse;
k.tmpKey = keySer.read(in, k.tmpKey);
@@ -388,7 +389,7 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
}
/** {@inheritDoc} */
- @Override public void write(Object key, Object val) throws GridException {
+ @Override public void write(Object key, Object val) throws IgniteCheckedException {
A.notNull(val, "val");
add(key, val);
@@ -430,9 +431,9 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
* @param key Key.
* @param val Value.
* @return Updated or created meta page pointer.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private long add(Object key, @Nullable Object val) throws GridException {
+ private long add(Object key, @Nullable Object val) throws IgniteCheckedException {
AtomicLongArray tbl = oldTbl;
int keyHash = U.hash(key.hashCode());
@@ -534,7 +535,7 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
}
/** {@inheritDoc} */
- @Override public void close() throws GridException {
+ @Override public void close() throws IgniteCheckedException {
if (!adders.remove(this))
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimap.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimap.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimap.java
index 80c302e..97b8156 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimap.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimap.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.shuffle.collections;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.util.offheap.unsafe.*;
@@ -38,7 +39,7 @@ public class GridHadoopHashMultimap extends GridHadoopHashMultimapBase {
}
/** {@inheritDoc} */
- @Override public Adder startAdding(GridHadoopTaskContext ctx) throws GridException {
+ @Override public Adder startAdding(GridHadoopTaskContext ctx) throws IgniteCheckedException {
return new AdderImpl(ctx);
}
@@ -93,9 +94,9 @@ public class GridHadoopHashMultimap extends GridHadoopHashMultimapBase {
/**
* @param ctx Task context.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- protected AdderImpl(GridHadoopTaskContext ctx) throws GridException {
+ protected AdderImpl(GridHadoopTaskContext ctx) throws IgniteCheckedException {
super(ctx);
keyReader = new Reader(keySer);
@@ -122,7 +123,7 @@ public class GridHadoopHashMultimap extends GridHadoopHashMultimapBase {
}
/** {@inheritDoc} */
- @Override public void write(Object key, Object val) throws GridException {
+ @Override public void write(Object key, Object val) throws IgniteCheckedException {
A.notNull(val, "val");
int keyHash = U.hash(key.hashCode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
index 71fc6b7..8616a70 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.shuffle.collections;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.util.offheap.unsafe.*;
@@ -28,12 +29,12 @@ public abstract class GridHadoopHashMultimapBase extends GridHadoopMultimapBase
}
/** {@inheritDoc} */
- @Override public boolean visit(boolean ignoreLastVisited, Visitor v) throws GridException {
+ @Override public boolean visit(boolean ignoreLastVisited, Visitor v) throws IgniteCheckedException {
throw new UnsupportedOperationException("visit");
}
/** {@inheritDoc} */
- @Override public GridHadoopTaskInput input(GridHadoopTaskContext taskCtx) throws GridException {
+ @Override public GridHadoopTaskInput input(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
return new Input(taskCtx);
}
@@ -126,8 +127,8 @@ public abstract class GridHadoopHashMultimapBase extends GridHadoopMultimapBase
try {
return read(key(meta), keySize(meta));
}
- catch (GridException e) {
- throw new GridRuntimeException(e);
+ catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
}
}
}
@@ -152,10 +153,10 @@ public abstract class GridHadoopHashMultimapBase extends GridHadoopMultimapBase
private final Reader valReader;
/**
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
* @param taskCtx Task context.
*/
- public Input(GridHadoopTaskContext taskCtx) throws GridException {
+ public Input(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
cap = capacity();
keyReader = new Reader(taskCtx.keySerialization());
@@ -192,7 +193,7 @@ public abstract class GridHadoopHashMultimapBase extends GridHadoopMultimapBase
}
/** {@inheritDoc} */
- @Override public void close() throws GridException {
+ @Override public void close() throws IgniteCheckedException {
keyReader.close();
valReader.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopMultimap.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopMultimap.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopMultimap.java
index 4eceecd..ed62ece 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopMultimap.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopMultimap.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.shuffle.collections;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.jetbrains.annotations.*;
@@ -27,22 +28,22 @@ public interface GridHadoopMultimap extends AutoCloseable {
* @param v Visitor.
* @return {@code false} If visiting was impossible.
*/
- public boolean visit(boolean ignoreLastVisited, Visitor v) throws GridException;
+ public boolean visit(boolean ignoreLastVisited, Visitor v) throws IgniteCheckedException;
/**
* @param ctx Task context.
* @return Adder.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public Adder startAdding(GridHadoopTaskContext ctx) throws GridException;
+ public Adder startAdding(GridHadoopTaskContext ctx) throws IgniteCheckedException;
/**
* @param taskCtx Task context.
* @return Task input.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
public GridHadoopTaskInput input(GridHadoopTaskContext taskCtx)
- throws GridException;
+ throws IgniteCheckedException;
/** {@inheritDoc} */
@Override public void close();
@@ -55,9 +56,9 @@ public interface GridHadoopMultimap extends AutoCloseable {
* @param in Data input.
* @param reuse Reusable key.
* @return Key.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public Key addKey(DataInput in, @Nullable Key reuse) throws GridException;
+ public Key addKey(DataInput in, @Nullable Key reuse) throws IgniteCheckedException;
}
/**
@@ -93,12 +94,12 @@ public interface GridHadoopMultimap extends AutoCloseable {
* @param keyPtr Key pointer.
* @param keySize Key size.
*/
- public void onKey(long keyPtr, int keySize) throws GridException;
+ public void onKey(long keyPtr, int keySize) throws IgniteCheckedException;
/**
* @param valPtr Value pointer.
* @param valSize Value size.
*/
- public void onValue(long valPtr, int valSize) throws GridException;
+ public void onValue(long valPtr, int valSize) throws IgniteCheckedException;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopMultimapBase.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopMultimapBase.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopMultimapBase.java
index ac5beba..f7d5769 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopMultimapBase.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopMultimapBase.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.shuffle.collections;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.shuffle.streams.*;
@@ -126,8 +127,8 @@ public abstract class GridHadoopMultimapBase implements GridHadoopMultimap {
try {
return read(valPtr + 12, valueSize(valPtr));
}
- catch (GridException e) {
- throw new GridRuntimeException(e);
+ catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
}
}
@@ -145,7 +146,7 @@ public abstract class GridHadoopMultimapBase implements GridHadoopMultimap {
* @param size Object size.
* @return Object.
*/
- protected Object read(long ptr, long size) throws GridException {
+ protected Object read(long ptr, long size) throws IgniteCheckedException {
in.buffer().set(ptr, size);
tmp = ser.read(in, tmp);
@@ -154,7 +155,7 @@ public abstract class GridHadoopMultimapBase implements GridHadoopMultimap {
}
/** {@inheritDoc} */
- @Override public void close() throws GridException {
+ @Override public void close() throws IgniteCheckedException {
ser.close();
}
}
@@ -180,9 +181,9 @@ public abstract class GridHadoopMultimapBase implements GridHadoopMultimap {
/**
* @param ctx Task context.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- protected AdderBase(GridHadoopTaskContext ctx) throws GridException {
+ protected AdderBase(GridHadoopTaskContext ctx) throws IgniteCheckedException {
valSer = ctx.valueSerialization();
keySer = ctx.keySerialization();
@@ -249,9 +250,9 @@ public abstract class GridHadoopMultimapBase implements GridHadoopMultimap {
* @param off Offset.
* @param o Object.
* @return Page pointer.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- protected long write(int off, Object o, GridHadoopSerialization ser) throws GridException {
+ protected long write(int off, Object o, GridHadoopSerialization ser) throws IgniteCheckedException {
writeStart = fixAlignment();
if (off != 0)
@@ -296,12 +297,12 @@ public abstract class GridHadoopMultimapBase implements GridHadoopMultimap {
}
/** {@inheritDoc} */
- @Override public Key addKey(DataInput in, @Nullable Key reuse) throws GridException {
+ @Override public Key addKey(DataInput in, @Nullable Key reuse) throws IgniteCheckedException {
throw new UnsupportedOperationException();
}
/** {@inheritDoc} */
- @Override public void close() throws GridException {
+ @Override public void close() throws IgniteCheckedException {
allPages.add(pages);
keySer.close();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopSkipList.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopSkipList.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopSkipList.java
index 9f3d1f5..bb6abce 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopSkipList.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopSkipList.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.shuffle.collections;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.util.*;
@@ -54,7 +55,7 @@ public class GridHadoopSkipList extends GridHadoopMultimapBase {
}
/** {@inheritDoc} */
- @Override public boolean visit(boolean ignoreLastVisited, Visitor v) throws GridException {
+ @Override public boolean visit(boolean ignoreLastVisited, Visitor v) throws IgniteCheckedException {
if (!visitGuard.compareAndSet(false, true))
return false;
@@ -85,12 +86,12 @@ public class GridHadoopSkipList extends GridHadoopMultimapBase {
}
/** {@inheritDoc} */
- @Override public Adder startAdding(GridHadoopTaskContext ctx) throws GridException {
+ @Override public Adder startAdding(GridHadoopTaskContext ctx) throws IgniteCheckedException {
return new AdderImpl(ctx);
}
/** {@inheritDoc} */
- @Override public GridHadoopTaskInput input(GridHadoopTaskContext taskCtx) throws GridException {
+ @Override public GridHadoopTaskInput input(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
Input in = new Input(taskCtx);
Comparator<Object> grpCmp = taskCtx.groupComparator();
@@ -251,8 +252,8 @@ public class GridHadoopSkipList extends GridHadoopMultimapBase {
try {
return read(k + 4, keySize(k));
}
- catch (GridException e) {
- throw new GridRuntimeException(e);
+ catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
}
}
}
@@ -275,9 +276,9 @@ public class GridHadoopSkipList extends GridHadoopMultimapBase {
/**
* @param ctx Task context.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- protected AdderImpl(GridHadoopTaskContext ctx) throws GridException {
+ protected AdderImpl(GridHadoopTaskContext ctx) throws IgniteCheckedException {
super(ctx);
keyReader = new Reader(keySer);
@@ -286,14 +287,14 @@ public class GridHadoopSkipList extends GridHadoopMultimapBase {
}
/** {@inheritDoc} */
- @Override public void write(Object key, Object val) throws GridException {
+ @Override public void write(Object key, Object val) throws IgniteCheckedException {
A.notNull(val, "val");
add(key, val);
}
/** {@inheritDoc} */
- @Override public Key addKey(DataInput in, @Nullable Key reuse) throws GridException {
+ @Override public Key addKey(DataInput in, @Nullable Key reuse) throws IgniteCheckedException {
KeyImpl k = reuse == null ? new KeyImpl() : (KeyImpl)reuse;
k.tmpKey = keySer.read(in, k.tmpKey);
@@ -327,9 +328,9 @@ public class GridHadoopSkipList extends GridHadoopMultimapBase {
/**
* @param key Key.
* @return Pointer.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private long writeKey(Object key) throws GridException {
+ private long writeKey(Object key) throws IgniteCheckedException {
long keyPtr = write(4, key, keySer);
int keySize = writtenSize() - 4;
@@ -358,9 +359,9 @@ public class GridHadoopSkipList extends GridHadoopMultimapBase {
* @param key Key.
* @param val Value.
* @return Meta pointer.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private long add(Object key, @Nullable Object val) throws GridException {
+ private long add(Object key, @Nullable Object val) throws IgniteCheckedException {
assert key != null;
stack.clear();
@@ -574,9 +575,9 @@ public class GridHadoopSkipList extends GridHadoopMultimapBase {
/**
* @param taskCtx Task context.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private Input(GridHadoopTaskContext taskCtx) throws GridException {
+ private Input(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
keyReader = new Reader(taskCtx.keySerialization());
valReader = new Reader(taskCtx.valueSerialization());
}
@@ -599,7 +600,7 @@ public class GridHadoopSkipList extends GridHadoopMultimapBase {
}
/** {@inheritDoc} */
- @Override public void close() throws GridException {
+ @Override public void close() throws IgniteCheckedException {
keyReader.close();
valReader.close();
}
@@ -711,7 +712,7 @@ public class GridHadoopSkipList extends GridHadoopMultimapBase {
}
/** {@inheritDoc} */
- @Override public void close() throws GridException {
+ @Override public void close() throws IgniteCheckedException {
in.close();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopEmbeddedTaskExecutor.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopEmbeddedTaskExecutor.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopEmbeddedTaskExecutor.java
index 08fd7cc..4f7b2cc 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopEmbeddedTaskExecutor.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopEmbeddedTaskExecutor.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.taskexecutor;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.jobtracker.*;
@@ -33,7 +34,7 @@ public class GridHadoopEmbeddedTaskExecutor extends GridHadoopTaskExecutorAdapte
private GridHadoopExecutorService exec;
/** {@inheritDoc} */
- @Override public void onKernalStart() throws GridException {
+ @Override public void onKernalStart() throws IgniteCheckedException {
super.onKernalStart();
jobTracker = ctx.jobTracker();
@@ -61,7 +62,7 @@ public class GridHadoopEmbeddedTaskExecutor extends GridHadoopTaskExecutorAdapte
}
/** {@inheritDoc} */
- @Override public void run(final GridHadoopJob job, Collection<GridHadoopTaskInfo> tasks) throws GridException {
+ @Override public void run(final GridHadoopJob job, Collection<GridHadoopTaskInfo> tasks) throws IgniteCheckedException {
if (log.isDebugEnabled())
log.debug("Submitting tasks for local execution [locNodeId=" + ctx.localNodeId() +
", tasksCnt=" + tasks.size() + ']');
@@ -93,11 +94,11 @@ public class GridHadoopEmbeddedTaskExecutor extends GridHadoopTaskExecutorAdapte
jobTracker.onTaskFinished(info, status);
}
- @Override protected GridHadoopTaskInput createInput(GridHadoopTaskContext taskCtx) throws GridException {
+ @Override protected GridHadoopTaskInput createInput(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
return ctx.shuffle().input(taskCtx);
}
- @Override protected GridHadoopTaskOutput createOutput(GridHadoopTaskContext taskCtx) throws GridException {
+ @Override protected GridHadoopTaskOutput createOutput(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
return ctx.shuffle().output(taskCtx);
}
};
@@ -128,7 +129,7 @@ public class GridHadoopEmbeddedTaskExecutor extends GridHadoopTaskExecutorAdapte
}
/** {@inheritDoc} */
- @Override public void onJobStateChanged(GridHadoopJobMetadata meta) throws GridException {
+ @Override public void onJobStateChanged(GridHadoopJobMetadata meta) throws IgniteCheckedException {
if (meta.phase() == GridHadoopJobPhase.PHASE_COMPLETE) {
Collection<GridHadoopRunnableTask> executedTasks = jobs.remove(meta.jobId());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopRunnableTask.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopRunnableTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopRunnableTask.java
index f918bd9..711d0a4 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopRunnableTask.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopRunnableTask.java
@@ -92,7 +92,7 @@ public abstract class GridHadoopRunnableTask implements Callable<Void> {
}
/** {@inheritDoc} */
- @Override public Void call() throws GridException {
+ @Override public Void call() throws IgniteCheckedException {
execStartTs = U.currentTimeMillis();
Throwable err = null;
@@ -153,9 +153,9 @@ public abstract class GridHadoopRunnableTask implements Callable<Void> {
/**
* @param perfCntr Performance counter.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private void runTask(GridHadoopPerformanceCounter perfCntr) throws GridException {
+ private void runTask(GridHadoopPerformanceCounter perfCntr) throws IgniteCheckedException {
if (cancelled)
throw new GridHadoopTaskCancelledException("Task cancelled.");
@@ -189,10 +189,10 @@ public abstract class GridHadoopRunnableTask implements Callable<Void> {
/**
* @param ctx Task context.
* @return Task input.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("unchecked")
- private GridHadoopTaskInput createInputInternal(GridHadoopTaskContext ctx) throws GridException {
+ private GridHadoopTaskInput createInputInternal(GridHadoopTaskContext ctx) throws IgniteCheckedException {
switch (ctx.taskInfo().type()) {
case SETUP:
case MAP:
@@ -213,23 +213,23 @@ public abstract class GridHadoopRunnableTask implements Callable<Void> {
/**
* @param ctx Task context.
* @return Input.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- protected abstract GridHadoopTaskInput createInput(GridHadoopTaskContext ctx) throws GridException;
+ protected abstract GridHadoopTaskInput createInput(GridHadoopTaskContext ctx) throws IgniteCheckedException;
/**
* @param ctx Task info.
* @return Output.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- protected abstract GridHadoopTaskOutput createOutput(GridHadoopTaskContext ctx) throws GridException;
+ protected abstract GridHadoopTaskOutput createOutput(GridHadoopTaskContext ctx) throws IgniteCheckedException;
/**
* @param ctx Task info.
* @return Task output.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private GridHadoopTaskOutput createOutputInternal(GridHadoopTaskContext ctx) throws GridException {
+ private GridHadoopTaskOutput createOutputInternal(GridHadoopTaskContext ctx) throws IgniteCheckedException {
switch (ctx.taskInfo().type()) {
case SETUP:
case REDUCE:
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopTaskExecutorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopTaskExecutorAdapter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopTaskExecutorAdapter.java
index 50326a3..7a14a62 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopTaskExecutorAdapter.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopTaskExecutorAdapter.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.taskexecutor;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.*;
@@ -25,9 +26,9 @@ public abstract class GridHadoopTaskExecutorAdapter extends GridHadoopComponent
*
* @param job Job.
* @param tasks Tasks.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public abstract void run(final GridHadoopJob job, Collection<GridHadoopTaskInfo> tasks) throws GridException;
+ public abstract void run(final GridHadoopJob job, Collection<GridHadoopTaskInfo> tasks) throws IgniteCheckedException;
/**
* Cancels all currently running tasks for given job ID and cancels scheduled execution of tasks
@@ -39,12 +40,12 @@ public abstract class GridHadoopTaskExecutorAdapter extends GridHadoopComponent
*
* @param jobId Job ID to cancel.
*/
- public abstract void cancelTasks(GridHadoopJobId jobId) throws GridException;
+ public abstract void cancelTasks(GridHadoopJobId jobId) throws IgniteCheckedException;
/**
* On job state change callback;
*
* @param meta Job metadata.
*/
- public abstract void onJobStateChanged(GridHadoopJobMetadata meta) throws GridException;
+ public abstract void onJobStateChanged(GridHadoopJobMetadata meta) throws IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
index 248a754..bb0c65c 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
@@ -73,7 +73,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
private GridHadoopJobTracker jobTracker;
/** {@inheritDoc} */
- @Override public void start(GridHadoopContext ctx) throws GridException {
+ @Override public void start(GridHadoopContext ctx) throws IgniteCheckedException {
this.ctx = ctx;
log = ctx.kernalContext().log(GridHadoopExternalTaskExecutor.class);
@@ -115,7 +115,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
try {
comm.stop();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to gracefully stop external hadoop communication server (will shutdown anyway)", e);
}
}
@@ -157,7 +157,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
sendJobInfoUpdate(proc, meta);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
if (log.isDebugEnabled())
log.debug("Failed to initialize child process (will skip job state notification) " +
"[jobId=" + meta.jobId() + ", meta=" + meta + ", err=" + e + ']');
@@ -173,7 +173,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
try {
job = jobTracker.job(meta.jobId(), meta.jobInfo());
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to get job: " + meta.jobId(), e);
return;
@@ -185,7 +185,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
/** {@inheritDoc} */
@SuppressWarnings("ConstantConditions")
- @Override public void run(final GridHadoopJob job, final Collection<GridHadoopTaskInfo> tasks) throws GridException {
+ @Override public void run(final GridHadoopJob job, final Collection<GridHadoopTaskInfo> tasks) throws IgniteCheckedException {
if (!busyLock.tryReadLock()) {
if (log.isDebugEnabled())
log.debug("Failed to start hadoop tasks (grid is stopping, will ignore).");
@@ -234,7 +234,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
sendExecutionRequest(proc0, job, tasks);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
notifyTasksFailed(tasks, FAILED, e);
}
finally {
@@ -264,7 +264,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
* @param tasks Collection of tasks to execute in started process.
*/
private void sendExecutionRequest(HadoopProcess proc, GridHadoopJob job, Collection<GridHadoopTaskInfo> tasks)
- throws GridException {
+ throws IgniteCheckedException {
// Must synchronize since concurrent process crash may happen and will receive onConnectionLost().
proc.lock();
@@ -339,7 +339,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
ctx.kernalContext().closure().runLocalSafe(new Runnable() {
@Override public void run() {
if (!busyLock.tryReadLock()) {
- fut.onDone(new GridException("Failed to start external process (grid is stopping)."));
+ fut.onDone(new IgniteCheckedException("Failed to start external process (grid is stopping)."));
return;
}
@@ -383,14 +383,14 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
log.warning(sb.toString());
- fut.onDone(new GridException(sb.toString()));
+ fut.onDone(new IgniteCheckedException(sb.toString()));
break;
}
}
}
catch (Throwable e) {
- fut.onDone(new GridException("Failed to initialize child process: " + job, e));
+ fut.onDone(new IgniteCheckedException("Failed to initialize child process: " + job, e));
}
finally {
busyLock.readUnlock();
@@ -406,7 +406,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
prepareForJob(proc, job, plan);
}
- catch (GridException ignore) {
+ catch (IgniteCheckedException ignore) {
// Exception is printed in future's onDone() method.
}
}
@@ -418,16 +418,16 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
/**
* Checks that java local command is available.
*
- * @throws GridException If initialization failed.
+ * @throws IgniteCheckedException If initialization failed.
*/
- private void initJavaCommand() throws GridException {
+ private void initJavaCommand() throws IgniteCheckedException {
String javaHome = System.getProperty("java.home");
if (javaHome == null)
javaHome = System.getenv("JAVA_HOME");
if (javaHome == null)
- throw new GridException("Failed to locate JAVA_HOME.");
+ throw new IgniteCheckedException("Failed to locate JAVA_HOME.");
javaCmd = javaHome + File.separator + "bin" + File.separator + (U.isWindows() ? "java.exe" : "java");
@@ -439,7 +439,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
int res = proc.waitFor();
if (res != 0)
- throw new GridException("Failed to execute 'java -version' command (process finished with nonzero " +
+ throw new IgniteCheckedException("Failed to execute 'java -version' command (process finished with nonzero " +
"code) [exitCode=" + res + ", javaCmd='" + javaCmd + "', msg=" + F.first(out) + ']');
if (log.isInfoEnabled()) {
@@ -450,12 +450,12 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
}
}
catch (IOException e) {
- throw new GridException("Failed to check java for external task execution.", e);
+ throw new IgniteCheckedException("Failed to check java for external task execution.", e);
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
- throw new GridException("Failed to wait for process completion (thread got interrupted).", e);
+ throw new IgniteCheckedException("Failed to wait for process completion (thread got interrupted).", e);
}
}
@@ -581,7 +581,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
try {
comm.sendMessage(proc.descriptor(), new GridHadoopJobInfoUpdateRequest(proc.jobId, meta.phase(), addrs));
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
if (!proc.terminated()) {
log.error("Failed to send job state update message to remote child process (will kill the process) " +
"[jobId=" + proc.jobId + ", meta=" + meta + ']', e);
@@ -603,7 +603,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
comm.sendMessage(proc.descriptor(), new GridHadoopPrepareForJobRequest(job.id(), job.info(),
plan.reducers(), plan.reducers(ctx.localNodeId())));
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send job prepare request to remote process [proc=" + proc + ", job=" + job +
", plan=" + plan + ']', e);
@@ -684,7 +684,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
log.warning("Lost connection with alive process (will terminate): " + desc);
GridHadoopTaskStatus status = new GridHadoopTaskStatus(CRASHED,
- new GridException("Failed to run tasks (external process finished unexpectedly): " + desc));
+ new IgniteCheckedException("Failed to run tasks (external process finished unexpectedly): " + desc));
for (GridHadoopTaskInfo info : tasks)
jobTracker.onTaskFinished(info, status);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
index a0b44fe..b8da700 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
@@ -81,7 +81,7 @@ public class GridHadoopChildProcessRunner {
*/
public void start(GridHadoopExternalCommunication comm, GridHadoopProcessDescriptor nodeDesc,
ExecutorService msgExecSvc, IgniteLogger parentLog)
- throws GridException {
+ throws IgniteCheckedException {
this.comm = comm;
this.nodeDesc = nodeDesc;
this.msgExecSvc = msgExecSvc;
@@ -123,7 +123,7 @@ public class GridHadoopChildProcessRunner {
initFut.onDone(null, null);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to initialize process: " + req, e);
initFut.onDone(e);
@@ -173,18 +173,18 @@ public class GridHadoopChildProcessRunner {
}
@Override protected GridHadoopTaskInput createInput(GridHadoopTaskContext ctx)
- throws GridException {
+ throws IgniteCheckedException {
return shuffleJob.input(ctx);
}
@Override protected GridHadoopTaskOutput createOutput(GridHadoopTaskContext ctx)
- throws GridException {
+ throws IgniteCheckedException {
return shuffleJob.output(ctx);
}
});
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
for (GridHadoopTaskInfo info : req.tasks())
notifyTaskFinished(info, new GridHadoopTaskStatus(GridHadoopTaskState.FAILED, e), false);
}
@@ -223,7 +223,7 @@ public class GridHadoopChildProcessRunner {
shuffleJob.startSending("external",
new IgniteInClosure2X<GridHadoopProcessDescriptor, GridHadoopShuffleMessage>() {
@Override public void applyx(GridHadoopProcessDescriptor dest,
- GridHadoopShuffleMessage msg) throws GridException {
+ GridHadoopShuffleMessage msg) throws IgniteCheckedException {
comm.sendMessage(dest, msg);
}
});
@@ -246,7 +246,7 @@ public class GridHadoopChildProcessRunner {
try {
job.dispose(true);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to dispose job.", e);
}
}
@@ -293,7 +293,7 @@ public class GridHadoopChildProcessRunner {
comm.sendMessage(nodeDesc, new GridHadoopTaskFinishedMessage(taskInfo, status));
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
log.error("Failed to send message to parent node (will terminate child process).", e);
shutdown();
@@ -323,7 +323,7 @@ public class GridHadoopChildProcessRunner {
notifyTaskFinished(taskInfo, status, false);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
log.error("Failed to flush shuffle messages (will fail the task) [taskInfo=" + taskInfo +
", state=" + state + ", err=" + err + ']', e);
@@ -333,7 +333,7 @@ public class GridHadoopChildProcessRunner {
}
});
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
log.error("Failed to flush shuffle messages (will fail the task) [taskInfo=" + taskInfo +
", state=" + state + ", err=" + err + ']', e);
@@ -398,7 +398,7 @@ public class GridHadoopChildProcessRunner {
comm.sendMessage(desc, new GridHadoopShuffleAck(m.id(), m.jobId()));
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to process hadoop shuffle message [desc=" + desc + ", msg=" + msg + ']', e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
index df267a2..f523549 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
@@ -147,7 +147,7 @@ public class GridHadoopExternalProcessStarter {
try {
logger = url != null ? new IgniteLog4jLogger(url) : new IgniteLog4jLogger(true);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
System.err.println("Failed to create URL-based logger. Will use default one.");
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopCommunicationClient.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopCommunicationClient.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopCommunicationClient.java
index ee2a44c..23b44c6 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopCommunicationClient.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopCommunicationClient.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.kernal.processors.hadoop.message.*;
import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*;
@@ -58,7 +59,7 @@ public interface GridHadoopCommunicationClient {
/**
* @param desc Process descriptor.
* @param msg Message to send.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public void sendMessage(GridHadoopProcessDescriptor desc, GridHadoopMessage msg) throws GridException;
+ public void sendMessage(GridHadoopProcessDescriptor desc, GridHadoopMessage msg) throws IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
index 2997d46..c378c64 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
@@ -511,20 +511,20 @@ public class GridHadoopExternalCommunication {
/**
* Starts communication.
*
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public void start() throws GridException {
+ public void start() throws IgniteCheckedException {
try {
locHost = U.getLocalHost();
}
catch (IOException e) {
- throw new GridException("Failed to initialize local address.", e);
+ throw new IgniteCheckedException("Failed to initialize local address.", e);
}
try {
shmemSrv = resetShmemServer();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.warn(log, "Failed to start shared memory communication server.", e);
}
@@ -533,8 +533,8 @@ public class GridHadoopExternalCommunication {
// local node was bound to.
nioSrvr = resetNioServer();
}
- catch (GridException e) {
- throw new GridException("Failed to initialize TCP server: " + locHost, e);
+ catch (IgniteCheckedException e) {
+ throw new IgniteCheckedException("Failed to initialize TCP server: " + locHost, e);
}
locProcDesc.address(locHost.getHostAddress());
@@ -579,13 +579,13 @@ public class GridHadoopExternalCommunication {
* Recreates tpcSrvr socket instance.
*
* @return Server instance.
- * @throws GridException Thrown if it's not possible to create server.
+ * @throws IgniteCheckedException Thrown if it's not possible to create server.
*/
- private GridNioServer<GridHadoopMessage> resetNioServer() throws GridException {
+ private GridNioServer<GridHadoopMessage> resetNioServer() throws IgniteCheckedException {
if (boundTcpPort >= 0)
- throw new GridException("Tcp NIO server was already created on port " + boundTcpPort);
+ throw new IgniteCheckedException("Tcp NIO server was already created on port " + boundTcpPort);
- GridException lastEx = null;
+ IgniteCheckedException lastEx = null;
// If configured TCP port is busy, find first available in range.
for (int port = locPort; port < locPort + locPortRange; port++) {
@@ -617,7 +617,7 @@ public class GridHadoopExternalCommunication {
return srvr;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
lastEx = e;
if (log.isDebugEnabled())
@@ -627,23 +627,23 @@ public class GridHadoopExternalCommunication {
}
// If free port wasn't found.
- throw new GridException("Failed to bind to any port within range [startPort=" + locPort +
+ throw new IgniteCheckedException("Failed to bind to any port within range [startPort=" + locPort +
", portRange=" + locPortRange + ", locHost=" + locHost + ']', lastEx);
}
/**
* Creates new shared memory communication server.
* @return Server.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- @Nullable private GridIpcSharedMemoryServerEndpoint resetShmemServer() throws GridException {
+ @Nullable private GridIpcSharedMemoryServerEndpoint resetShmemServer() throws IgniteCheckedException {
if (boundTcpShmemPort >= 0)
- throw new GridException("Shared memory server was already created on port " + boundTcpShmemPort);
+ throw new IgniteCheckedException("Shared memory server was already created on port " + boundTcpShmemPort);
if (shmemPort == -1 || U.isWindows())
return null;
- GridException lastEx = null;
+ IgniteCheckedException lastEx = null;
// If configured TCP port is busy, find first available in range.
for (int port = shmemPort; port < shmemPort + locPortRange; port++) {
@@ -667,7 +667,7 @@ public class GridHadoopExternalCommunication {
return srv;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
lastEx = e;
if (log.isDebugEnabled())
@@ -677,11 +677,11 @@ public class GridHadoopExternalCommunication {
}
// If free port wasn't found.
- throw new GridException("Failed to bind shared memory communication to any port within range [startPort=" +
+ throw new IgniteCheckedException("Failed to bind shared memory communication to any port within range [startPort=" +
locPort + ", portRange=" + locPortRange + ", locHost=" + locHost + ']', lastEx);
}
- public void stop() throws GridException {
+ public void stop() throws IgniteCheckedException {
// Stop TCP server.
if (nioSrvr != null)
nioSrvr.stop();
@@ -705,7 +705,7 @@ public class GridHadoopExternalCommunication {
}
public void sendMessage(GridHadoopProcessDescriptor desc, GridHadoopMessage msg) throws
- GridException {
+ IgniteCheckedException {
assert desc != null;
assert msg != null;
@@ -741,9 +741,9 @@ public class GridHadoopExternalCommunication {
*
* @param desc Node to which client should be open.
* @return The existing or just created client.
- * @throws GridException Thrown if any exception occurs.
+ * @throws IgniteCheckedException Thrown if any exception occurs.
*/
- private GridHadoopCommunicationClient reserveClient(GridHadoopProcessDescriptor desc) throws GridException {
+ private GridHadoopCommunicationClient reserveClient(GridHadoopProcessDescriptor desc) throws IgniteCheckedException {
assert desc != null;
UUID procId = desc.processId();
@@ -786,10 +786,10 @@ public class GridHadoopExternalCommunication {
/**
* @param desc Process descriptor.
* @return Client.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@Nullable protected GridHadoopCommunicationClient createNioClient(GridHadoopProcessDescriptor desc)
- throws GridException {
+ throws IgniteCheckedException {
assert desc != null;
int shmemPort = desc.sharedMemoryPort();
@@ -800,7 +800,7 @@ public class GridHadoopExternalCommunication {
try {
return createShmemClient(desc, shmemPort);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
if (e.hasCause(GridIpcOutOfSystemResourcesException.class))
// Has cause or is itself the GridIpcOutOfSystemResourcesException.
LT.warn(log, null, OUT_OF_RESOURCES_TCP_MSG);
@@ -817,10 +817,10 @@ public class GridHadoopExternalCommunication {
* @param desc Process descriptor.
* @param port Port.
* @return Client.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@Nullable protected GridHadoopCommunicationClient createShmemClient(GridHadoopProcessDescriptor desc, int port)
- throws GridException {
+ throws IgniteCheckedException {
int attempt = 1;
int connectAttempts = 1;
@@ -833,7 +833,7 @@ public class GridHadoopExternalCommunication {
try {
clientEndpoint = new GridIpcSharedMemoryClientEndpoint(port, (int)connTimeout, log);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// Reconnect for the second time, if connection is not established.
if (connectAttempts < 2 && X.hasCause(e, ConnectException.class)) {
connectAttempts++;
@@ -909,9 +909,9 @@ public class GridHadoopExternalCommunication {
*
* @param desc Process descriptor.
* @return Client.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- protected GridHadoopCommunicationClient createTcpClient(GridHadoopProcessDescriptor desc) throws GridException {
+ protected GridHadoopCommunicationClient createTcpClient(GridHadoopProcessDescriptor desc) throws IgniteCheckedException {
String addr = desc.address();
int port = desc.tcpPort();
@@ -921,7 +921,7 @@ public class GridHadoopExternalCommunication {
boolean conn = false;
GridHadoopTcpNioCommunicationClient client = null;
- GridException errs = null;
+ IgniteCheckedException errs = null;
int connectAttempts = 1;
@@ -979,7 +979,7 @@ public class GridHadoopExternalCommunication {
", err=" + e.getMessage() + ", addr=" + addr + ']');
if (errs == null)
- errs = new GridException("Failed to connect to remote Hadoop process " +
+ errs = new IgniteCheckedException("Failed to connect to remote Hadoop process " +
"(is process still running?) [desc=" + desc + ", addrs=" + addr + ']');
errs.addSuppressed(e);
@@ -1010,7 +1010,7 @@ public class GridHadoopExternalCommunication {
"configuration property) [addr=" + addr + ", port=" + port + ']');
if (errs == null)
- errs = new GridException("Failed to connect to remote Hadoop process (is process still running?) " +
+ errs = new IgniteCheckedException("Failed to connect to remote Hadoop process (is process still running?) " +
"[desc=" + desc + ", addrs=" + addr + ']');
errs.addSuppressed(e);
@@ -1092,7 +1092,7 @@ public class GridHadoopExternalCommunication {
new IgniteThread(e).start();
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
if (!isCancelled())
U.error(log, "Shmem server failed.", e);
}
@@ -1219,7 +1219,7 @@ public class GridHadoopExternalCommunication {
}
/** {@inheritDoc} */
- @Override public void onSessionOpened(final GridNioSession ses) throws GridException {
+ @Override public void onSessionOpened(final GridNioSession ses) throws IgniteCheckedException {
if (ses.accepted()) {
if (log.isDebugEnabled())
log.debug("Accepted connection, initiating handshake: " + ses);
@@ -1231,7 +1231,7 @@ public class GridHadoopExternalCommunication {
// Make sure there were no errors.
fut.get();
}
- catch (GridException | IOException e) {
+ catch (IgniteCheckedException | IOException e) {
log.warning("Failed to send handshake message, will close session: " + ses, e);
ses.close();
@@ -1242,17 +1242,17 @@ public class GridHadoopExternalCommunication {
}
/** {@inheritDoc} */
- @Override public void onSessionClosed(GridNioSession ses) throws GridException {
+ @Override public void onSessionClosed(GridNioSession ses) throws IgniteCheckedException {
proceedSessionClosed(ses);
}
/** {@inheritDoc} */
- @Override public void onExceptionCaught(GridNioSession ses, GridException ex) throws GridException {
+ @Override public void onExceptionCaught(GridNioSession ses, IgniteCheckedException ex) throws IgniteCheckedException {
proceedExceptionCaught(ses, ex);
}
/** {@inheritDoc} */
- @Override public GridNioFuture<?> onSessionWrite(GridNioSession ses, Object msg) throws GridException {
+ @Override public GridNioFuture<?> onSessionWrite(GridNioSession ses, Object msg) throws IgniteCheckedException {
if (ses.meta(PROCESS_META) == null && !(msg instanceof ProcessHandshakeMessage))
log.warning("Writing message before handshake has finished [ses=" + ses + ", msg=" + msg + ']');
@@ -1260,7 +1260,7 @@ public class GridHadoopExternalCommunication {
}
/** {@inheritDoc} */
- @Override public void onMessageReceived(GridNioSession ses, Object msg) throws GridException {
+ @Override public void onMessageReceived(GridNioSession ses, Object msg) throws IgniteCheckedException {
GridHadoopProcessDescriptor desc = ses.meta(PROCESS_META);
UUID rmtProcId = desc == null ? null : desc.processId();
@@ -1350,17 +1350,17 @@ public class GridHadoopExternalCommunication {
}
/** {@inheritDoc} */
- @Override public GridNioFuture<Boolean> onSessionClose(GridNioSession ses) throws GridException {
+ @Override public GridNioFuture<Boolean> onSessionClose(GridNioSession ses) throws IgniteCheckedException {
return proceedSessionClose(ses);
}
/** {@inheritDoc} */
- @Override public void onSessionIdleTimeout(GridNioSession ses) throws GridException {
+ @Override public void onSessionIdleTimeout(GridNioSession ses) throws IgniteCheckedException {
proceedSessionIdleTimeout(ses);
}
/** {@inheritDoc} */
- @Override public void onSessionWriteTimeout(GridNioSession ses) throws GridException {
+ @Override public void onSessionWriteTimeout(GridNioSession ses) throws IgniteCheckedException {
proceedSessionWriteTimeout(ses);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopHandshakeTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopHandshakeTimeoutException.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopHandshakeTimeoutException.java
index 0f8dc7c..971fc78 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopHandshakeTimeoutException.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopHandshakeTimeoutException.java
@@ -9,11 +9,12 @@
package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.jetbrains.annotations.*;
/** Internal exception class for proper timeout handling. */
-class GridHadoopHandshakeTimeoutException extends GridException {
+class GridHadoopHandshakeTimeoutException extends IgniteCheckedException {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopIpcToNioAdapter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopIpcToNioAdapter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopIpcToNioAdapter.java
index 28ce004..c37e3d0 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopIpcToNioAdapter.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopIpcToNioAdapter.java
@@ -109,7 +109,7 @@ public class GridHadoopIpcToNioAdapter<T> {
chain.onSessionClosed(ses);
}
catch (Exception e) {
- chain.onExceptionCaught(ses, new GridException("Failed to read from IPC endpoint.", e));
+ chain.onExceptionCaught(ses, new IgniteCheckedException("Failed to read from IPC endpoint.", e));
}
}
@@ -140,7 +140,7 @@ public class GridHadoopIpcToNioAdapter<T> {
endp.outputStream().write(writeBuf.array(), 0, writeBuf.position());
}
}
- catch (IOException | GridException e) {
+ catch (IOException | IgniteCheckedException e) {
return new GridNioFinishedFuture<Object>(e);
}
@@ -159,17 +159,17 @@ public class GridHadoopIpcToNioAdapter<T> {
}
/** {@inheritDoc} */
- @Override public void onSessionOpened(GridNioSession ses) throws GridException {
+ @Override public void onSessionOpened(GridNioSession ses) throws IgniteCheckedException {
proceedSessionOpened(ses);
}
/** {@inheritDoc} */
- @Override public void onSessionClosed(GridNioSession ses) throws GridException {
+ @Override public void onSessionClosed(GridNioSession ses) throws IgniteCheckedException {
proceedSessionClosed(ses);
}
/** {@inheritDoc} */
- @Override public void onExceptionCaught(GridNioSession ses, GridException ex) throws GridException {
+ @Override public void onExceptionCaught(GridNioSession ses, IgniteCheckedException ex) throws IgniteCheckedException {
proceedExceptionCaught(ses, ex);
}
@@ -182,12 +182,12 @@ public class GridHadoopIpcToNioAdapter<T> {
}
/** {@inheritDoc} */
- @Override public void onMessageReceived(GridNioSession ses, Object msg) throws GridException {
+ @Override public void onMessageReceived(GridNioSession ses, Object msg) throws IgniteCheckedException {
proceedMessageReceived(ses, msg);
}
/** {@inheritDoc} */
- @Override public GridNioFuture<?> onPauseReads(GridNioSession ses) throws GridException {
+ @Override public GridNioFuture<?> onPauseReads(GridNioSession ses) throws IgniteCheckedException {
// This call should be synced externally to avoid races.
boolean b = latchRef.compareAndSet(null, new CountDownLatch(1));
@@ -197,7 +197,7 @@ public class GridHadoopIpcToNioAdapter<T> {
}
/** {@inheritDoc} */
- @Override public GridNioFuture<?> onResumeReads(GridNioSession ses) throws GridException {
+ @Override public GridNioFuture<?> onResumeReads(GridNioSession ses) throws IgniteCheckedException {
// This call should be synced externally to avoid races.
CountDownLatch latch = latchRef.getAndSet(null);
@@ -220,12 +220,12 @@ public class GridHadoopIpcToNioAdapter<T> {
}
/** {@inheritDoc} */
- @Override public void onSessionIdleTimeout(GridNioSession ses) throws GridException {
+ @Override public void onSessionIdleTimeout(GridNioSession ses) throws IgniteCheckedException {
proceedSessionIdleTimeout(ses);
}
/** {@inheritDoc} */
- @Override public void onSessionWriteTimeout(GridNioSession ses) throws GridException {
+ @Override public void onSessionWriteTimeout(GridNioSession ses) throws IgniteCheckedException {
proceedSessionWriteTimeout(ses);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
index 76b29cd..093f951 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication;
+import org.apache.ignite.*;
import org.apache.ignite.marshaller.*;
import org.gridgain.grid.*;
import org.gridgain.grid.kernal.processors.hadoop.message.*;
@@ -31,28 +32,28 @@ public class GridHadoopMarshallerFilter extends GridNioFilterAdapter {
}
/** {@inheritDoc} */
- @Override public void onSessionOpened(GridNioSession ses) throws GridException {
+ @Override public void onSessionOpened(GridNioSession ses) throws IgniteCheckedException {
proceedSessionOpened(ses);
}
/** {@inheritDoc} */
- @Override public void onSessionClosed(GridNioSession ses) throws GridException {
+ @Override public void onSessionClosed(GridNioSession ses) throws IgniteCheckedException {
proceedSessionClosed(ses);
}
/** {@inheritDoc} */
- @Override public void onExceptionCaught(GridNioSession ses, GridException ex) throws GridException {
+ @Override public void onExceptionCaught(GridNioSession ses, IgniteCheckedException ex) throws IgniteCheckedException {
proceedExceptionCaught(ses, ex);
}
/** {@inheritDoc} */
- @Override public GridNioFuture<?> onSessionWrite(GridNioSession ses, Object msg) throws GridException {
+ @Override public GridNioFuture<?> onSessionWrite(GridNioSession ses, Object msg) throws IgniteCheckedException {
assert msg instanceof GridHadoopMessage : "Invalid message type: " + msg;
return proceedSessionWrite(ses, marshaller.marshal(msg));
}
- @Override public void onMessageReceived(GridNioSession ses, Object msg) throws GridException {
+ @Override public void onMessageReceived(GridNioSession ses, Object msg) throws IgniteCheckedException {
assert msg instanceof byte[];
// Always unmarshal with system classloader.
@@ -60,17 +61,17 @@ public class GridHadoopMarshallerFilter extends GridNioFilterAdapter {
}
/** {@inheritDoc} */
- @Override public GridNioFuture<Boolean> onSessionClose(GridNioSession ses) throws GridException {
+ @Override public GridNioFuture<Boolean> onSessionClose(GridNioSession ses) throws IgniteCheckedException {
return proceedSessionClose(ses);
}
/** {@inheritDoc} */
- @Override public void onSessionIdleTimeout(GridNioSession ses) throws GridException {
+ @Override public void onSessionIdleTimeout(GridNioSession ses) throws IgniteCheckedException {
proceedSessionIdleTimeout(ses);
}
/** {@inheritDoc} */
- @Override public void onSessionWriteTimeout(GridNioSession ses) throws GridException {
+ @Override public void onSessionWriteTimeout(GridNioSession ses) throws IgniteCheckedException {
proceedSessionWriteTimeout(ses);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopTcpNioCommunicationClient.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopTcpNioCommunicationClient.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopTcpNioCommunicationClient.java
index 42dca48..50dceb1 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopTcpNioCommunicationClient.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopTcpNioCommunicationClient.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.kernal.processors.hadoop.message.*;
import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*;
@@ -59,9 +60,9 @@ public class GridHadoopTcpNioCommunicationClient extends GridHadoopAbstractCommu
/** {@inheritDoc} */
@Override public void sendMessage(GridHadoopProcessDescriptor desc, GridHadoopMessage msg)
- throws GridException {
+ throws IgniteCheckedException {
if (closed())
- throw new GridException("Client was closed: " + this);
+ throw new IgniteCheckedException("Client was closed: " + this);
GridNioFuture<?> fut = ses.send(msg);
@@ -70,7 +71,7 @@ public class GridHadoopTcpNioCommunicationClient extends GridHadoopAbstractCommu
fut.get();
}
catch (IOException e) {
- throw new GridException("Failed to send message [client=" + this + ']', e);
+ throw new IgniteCheckedException("Failed to send message [client=" + this + ']', e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1CleanupTask.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1CleanupTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1CleanupTask.java
index 1b23c59..fb06388 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1CleanupTask.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1CleanupTask.java
@@ -10,6 +10,7 @@
package org.gridgain.grid.kernal.processors.hadoop.v1;
import org.apache.hadoop.mapred.*;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.v2.*;
@@ -34,7 +35,7 @@ public class GridHadoopV1CleanupTask extends GridHadoopV1Task {
}
/** {@inheritDoc} */
- @Override public void run(GridHadoopTaskContext taskCtx) throws GridException {
+ @Override public void run(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
GridHadoopV2TaskContext ctx = (GridHadoopV2TaskContext)taskCtx;
JobContext jobCtx = ctx.jobContext();
@@ -48,7 +49,7 @@ public class GridHadoopV1CleanupTask extends GridHadoopV1Task {
committer.commitJob(jobCtx);
}
catch (IOException e) {
- throw new GridException(e);
+ throw new IgniteCheckedException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1MapTask.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1MapTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1MapTask.java
index 7ba428e..3eb1f17 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1MapTask.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1MapTask.java
@@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.hadoop.v1;
import org.apache.hadoop.fs.*;
import org.apache.hadoop.mapred.*;
import org.apache.hadoop.util.*;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.*;
@@ -31,7 +32,7 @@ public class GridHadoopV1MapTask extends GridHadoopV1Task {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override public void run(GridHadoopTaskContext taskCtx) throws GridException {
+ @Override public void run(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
GridHadoopJob job = taskCtx.job();
GridHadoopV2TaskContext ctx = (GridHadoopV2TaskContext)taskCtx;
@@ -94,7 +95,7 @@ public class GridHadoopV1MapTask extends GridHadoopV1Task {
if (collector != null)
collector.abort();
- throw new GridException(e);
+ throw new IgniteCheckedException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1OutputCollector.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1OutputCollector.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1OutputCollector.java
index a8661bc..a5225b9 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1OutputCollector.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1OutputCollector.java
@@ -13,6 +13,7 @@ import org.apache.hadoop.mapred.*;
import org.apache.hadoop.mapred.OutputFormat;
import org.apache.hadoop.mapred.RecordWriter;
import org.apache.hadoop.mapred.TaskAttemptID;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.jetbrains.annotations.*;
@@ -68,7 +69,7 @@ public class GridHadoopV1OutputCollector implements OutputCollector {
try {
taskCtx.output().write(key, val);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
throw new IOException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1ReduceTask.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1ReduceTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1ReduceTask.java
index d4723ce..01aad48 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1ReduceTask.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1ReduceTask.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.hadoop.v1;
import org.apache.hadoop.mapred.*;
import org.apache.hadoop.util.*;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.*;
@@ -37,7 +38,7 @@ public class GridHadoopV1ReduceTask extends GridHadoopV1Task {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override public void run(GridHadoopTaskContext taskCtx) throws GridException {
+ @Override public void run(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
GridHadoopJob job = taskCtx.job();
GridHadoopV2TaskContext ctx = (GridHadoopV2TaskContext)taskCtx;
@@ -79,7 +80,7 @@ public class GridHadoopV1ReduceTask extends GridHadoopV1Task {
if (collector != null)
collector.abort();
- throw new GridException(e);
+ throw new IgniteCheckedException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1SetupTask.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1SetupTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1SetupTask.java
index f1cb370..66c2c1c 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1SetupTask.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1SetupTask.java
@@ -10,6 +10,7 @@
package org.gridgain.grid.kernal.processors.hadoop.v1;
import org.apache.hadoop.mapred.*;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.v2.*;
@@ -30,7 +31,7 @@ public class GridHadoopV1SetupTask extends GridHadoopV1Task {
}
/** {@inheritDoc} */
- @Override public void run(GridHadoopTaskContext taskCtx) throws GridException {
+ @Override public void run(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
GridHadoopV2TaskContext ctx = (GridHadoopV2TaskContext)taskCtx;
try {
@@ -42,7 +43,7 @@ public class GridHadoopV1SetupTask extends GridHadoopV1Task {
committer.setupJob(ctx.jobContext());
}
catch (IOException e) {
- throw new GridException(e);
+ throw new IgniteCheckedException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1Splitter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1Splitter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1Splitter.java
index 2e0ff11..3a72050 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1Splitter.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v1/GridHadoopV1Splitter.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.hadoop.v1;
import org.apache.hadoop.fs.*;
import org.apache.hadoop.mapred.*;
+import org.apache.ignite.*;
import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.*;
@@ -30,9 +31,9 @@ public class GridHadoopV1Splitter {
/**
* @param jobConf Job configuration.
* @return Collection of mapped splits.
- * @throws GridException If mapping failed.
+ * @throws IgniteCheckedException If mapping failed.
*/
- public static Collection<GridHadoopInputSplit> splitJob(JobConf jobConf) throws GridException {
+ public static Collection<GridHadoopInputSplit> splitJob(JobConf jobConf) throws IgniteCheckedException {
try {
InputFormat<?, ?> format = jobConf.getInputFormat();
@@ -57,7 +58,7 @@ public class GridHadoopV1Splitter {
return res;
}
catch (IOException e) {
- throw new GridException(e);
+ throw new IgniteCheckedException(e);
}
}
@@ -66,10 +67,10 @@ public class GridHadoopV1Splitter {
* @param in Input stream.
* @param hosts Optional hosts.
* @return File block or {@code null} if it is not a {@link FileSplit} instance.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@Nullable public static GridHadoopFileBlock readFileBlock(String clsName, FSDataInputStream in,
- @Nullable String[] hosts) throws GridException {
+ @Nullable String[] hosts) throws IgniteCheckedException {
if (!FileSplit.class.getName().equals(clsName))
return null;
@@ -79,7 +80,7 @@ public class GridHadoopV1Splitter {
split.readFields(in);
}
catch (IOException e) {
- throw new GridException(e);
+ throw new IgniteCheckedException(e);
}
if (hosts == null)