Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 95D6299FA for ; Fri, 12 Dec 2014 09:29:53 +0000 (UTC) Received: (qmail 52724 invoked by uid 500); 12 Dec 2014 09:29:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 52693 invoked by uid 500); 12 Dec 2014 09:29:53 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 52684 invoked by uid 99); 12 Dec 2014 09:29:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Dec 2014 09:29:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 12 Dec 2014 09:29:23 +0000 Received: (qmail 46425 invoked by uid 99); 12 Dec 2014 09:29:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Dec 2014 09:29:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 184AEA2899F; Fri, 12 Dec 2014 09:29:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 12 Dec 2014 09:29:06 -0000 Message-Id: <19bebacb82bc4335a7b50086431266be@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/67] [abbrv] [partial] incubator-ignite git commit: Rename GridException to IgniteCheckedException, GridRuntimeException to IgniteException. X-Virus-Checked: Checked by ClamAV on apache.org http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java index 8f91588..c68a218 100644 --- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java +++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java @@ -29,7 +29,7 @@ public class JobStealingTask extends ComputeTaskAdapter map(List subgrid, - @Nullable Object arg) throws GridException { + @Nullable Object arg) throws IgniteCheckedException { assert !subgrid.isEmpty(); Map map = U.newHashMap(subgrid.size()); @@ -43,7 +43,7 @@ public class JobStealingTask extends ComputeTaskAdapter reduce(List results) throws GridException { + @Override public Map reduce(List results) throws IgniteCheckedException { Map ret = U.newHashMap(results.size()); for (ComputeJobResult res : results) { @@ -78,7 +78,7 @@ public class JobStealingTask extends ComputeTaskAdapter split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentInnerTestTask.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentInnerTestTask.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentInnerTestTask.java index 8c08902..5d063c2 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentInnerTestTask.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentInnerTestTask.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -23,12 +24,12 @@ public class GridUriDeploymentInnerTestTask { */ public class GridInnerTestTask extends ComputeTaskSplitAdapter { /** {@inheritDoc} */ - @Override public Collection split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentNonePublicTestTask.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentNonePublicTestTask.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentNonePublicTestTask.java index 3dc04fd..8823996 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentNonePublicTestTask.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentNonePublicTestTask.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -19,12 +20,12 @@ import java.util.*; */ class GridUriDeploymentNonePublicTestTask extends ComputeTaskSplitAdapter { /** {@inheritDoc} */ - @Override public Collection split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask0.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask0.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask0.java index 323f086..bd43201 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask0.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask0.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -19,12 +20,12 @@ import java.util.*; */ public class GridUriDeploymentTestTask0 extends ComputeTaskSplitAdapter { /** {@inheritDoc} */ - @Override public Collection split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java index 7bb31b6..892b9a9 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; import org.springframework.beans.factory.xml.*; @@ -41,14 +42,14 @@ public class GridUriDeploymentTestTask1 extends ComputeTaskSplitAdapter split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java index b59f6ef..bbee39f 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; import org.springframework.beans.factory.xml.*; @@ -45,7 +46,7 @@ public class GridUriDeploymentTestTask2 extends ComputeTaskSplitAdapter split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { System.out.println("Split is called: " + this); return null; @@ -54,7 +55,7 @@ public class GridUriDeploymentTestTask2 extends ComputeTaskSplitAdapter results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { System.out.println("Reduce is called."); return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask3.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask3.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask3.java index 3d1af2b..738aa94 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask3.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask3.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -21,14 +22,14 @@ public class GridUriDeploymentTestTask3 extends ComputeTaskSplitAdapter split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask4.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask4.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask4.java index ac0d6e2..738cd13 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask4.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask4.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -21,14 +22,14 @@ public class GridUriDeploymentTestTask4 extends ComputeTaskSplitAdapter split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask5.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask5.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask5.java index 64d468c..99af880 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask5.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask5.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -21,14 +22,14 @@ public class GridUriDeploymentTestTask5 extends ComputeTaskSplitAdapter split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask6.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask6.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask6.java index 6df45db..7381dad 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask6.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask6.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -21,14 +22,14 @@ public class GridUriDeploymentTestTask6 extends ComputeTaskSplitAdapter split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask0.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask0.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask0.java index 75dcdd4..eaa78d1 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask0.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask0.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -22,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask0 extends ComputeTaskSplitAdapter< /** * {@inheritDoc} */ - @Override public Collection split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask3.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask3.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask3.java index 8646d29..f8a014b 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask3.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask3.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -22,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask3 extends ComputeTaskSplitAdapter< /** * {@inheritDoc} */ - @Override public Collection split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask4.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask4.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask4.java index ca24e24..2b33531 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask4.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask4.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -22,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask4 extends ComputeTaskSplitAdapter< /** * {@inheritDoc} */ - @Override public Collection split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask5.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask5.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask5.java index c5ee9d4..f59cefa 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask5.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask5.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -22,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask5 extends ComputeTaskSplitAdapter< /** * {@inheritDoc} */ - @Override public Collection split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask6.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask6.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask6.java index 52b4125..b24da56 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask6.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask6.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -22,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask6 extends ComputeTaskSplitAdapter< /** * {@inheritDoc} */ - @Override public Collection split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask7.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask7.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask7.java index 3052f67..3deb38b 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask7.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask7.java @@ -9,6 +9,7 @@ package org.apache.ignite.spi.deployment.uri.tasks; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; @@ -22,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask7 extends ComputeTaskSplitAdapter< /** * {@inheritDoc} */ - @Override public Collection split(int gridSize, Object arg) throws GridException { + @Override public Collection split(int gridSize, Object arg) throws IgniteCheckedException { return null; } /** * {@inheritDoc} */ - @Override public Object reduce(List results) throws GridException { + @Override public Object reduce(List results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocol.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocol.java b/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocol.java index 1c1312c..72b7bfe 100644 --- a/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocol.java +++ b/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocol.java @@ -21,6 +21,7 @@ import org.apache.hadoop.mapreduce.v2.jobhistory.*; import org.apache.hadoop.security.*; import org.apache.hadoop.security.authorize.*; import org.apache.hadoop.security.token.*; +import org.apache.ignite.*; import org.gridgain.client.*; import org.gridgain.client.hadoop.counter.*; import org.gridgain.grid.*; @@ -100,7 +101,7 @@ public class GridHadoopClientProtocol implements ClientProtocol { return processStatus(status); } - catch (GridClientException | GridException e) { + catch (GridClientException | IgniteCheckedException e) { throw new IOException("Failed to submit job.", e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocolProvider.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocolProvider.java b/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocolProvider.java index 36426ab..4883ce4 100644 --- a/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocolProvider.java +++ b/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocolProvider.java @@ -12,6 +12,7 @@ package org.gridgain.client.hadoop; import org.apache.hadoop.conf.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.protocol.*; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.gridgain.client.*; import org.gridgain.client.marshaller.optimized.*; @@ -122,7 +123,7 @@ public class GridHadoopClientProtocolProvider extends ClientProtocolProvider { else return fut.get(); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new IOException("Failed to establish connection with GridGain node: " + addr, e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java index aeb9267..976c507 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java @@ -16,6 +16,7 @@ import org.apache.hadoop.fs.permission.*; import org.apache.hadoop.hdfs.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.util.*; +import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.ggfs.common.*; @@ -1106,7 +1107,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem { pathUri.getAuthority() != null ? newUri.getAuthority() : null, pathUri.getPath(), null, null)); } catch (URISyntaxException e) { - throw new GridRuntimeException("Failed to construct secondary file system path from the primary file " + + throw new IgniteException("Failed to construct secondary file system path from the primary file " + "system path: " + path, e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java index 0a8e7f7..f833969 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java @@ -16,6 +16,7 @@ import org.apache.hadoop.fs.Options; import org.apache.hadoop.fs.permission.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.util.*; +import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.ggfs.common.*; @@ -856,7 +857,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos pathUri.getAuthority() != null ? newUri.getAuthority() : null, pathUri.getPath(), null, null)); } catch (URISyntaxException e) { - throw new GridRuntimeException("Failed to construct secondary file system path from the primary file " + + throw new IgniteException("Failed to construct secondary file system path from the primary file " + "system path: " + path, e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/hadoop/GridHadoopDefaultJobInfo.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/hadoop/GridHadoopDefaultJobInfo.java b/modules/hadoop/src/main/java/org/gridgain/grid/hadoop/GridHadoopDefaultJobInfo.java index c3e4cf6..f9bf93c 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/hadoop/GridHadoopDefaultJobInfo.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/hadoop/GridHadoopDefaultJobInfo.java @@ -76,7 +76,7 @@ public class GridHadoopDefaultJobInfo implements GridHadoopJobInfo, Externalizab } /** {@inheritDoc} */ - @Override public GridHadoopJob createJob(GridHadoopJobId jobId, IgniteLogger log) throws GridException { + @Override public GridHadoopJob createJob(GridHadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException { try { Class jobCls0 = jobCls; @@ -96,7 +96,7 @@ public class GridHadoopDefaultJobInfo implements GridHadoopJobInfo, Externalizab return (GridHadoopJob)constructor.newInstance(jobId, this, log); } catch (Exception 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/ggfs/hadoop/GridGgfsHadoop.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java index 642efbf..a9ea334 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.ggfs.hadoop; +import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.ggfs.*; @@ -26,9 +27,9 @@ public interface GridGgfsHadoop { * * @param logDir Log directory. * @return Future with handshake result. - * @throws org.gridgain.grid.GridException If failed. + * @throws IgniteCheckedException If failed. */ - public GridGgfsHandshakeResponse handshake(String logDir) throws GridException, IOException; + public GridGgfsHandshakeResponse handshake(String logDir) throws IgniteCheckedException, IOException; /** * Close connection. @@ -42,9 +43,9 @@ public interface GridGgfsHadoop { * * @param path Path to get file info for. * @return Future for info operation. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public IgniteFsFile info(IgniteFsPath path) throws GridException, IOException; + public IgniteFsFile info(IgniteFsPath path) throws IgniteCheckedException, IOException; /** * Command to update file properties. @@ -52,9 +53,9 @@ public interface GridGgfsHadoop { * @param path GGFS path to update properties. * @param props Properties to update. * @return Future for update operation. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public IgniteFsFile update(IgniteFsPath path, Map props) throws GridException, IOException; + public IgniteFsFile update(IgniteFsPath path, Map props) throws IgniteCheckedException, IOException; /** * Sets last access time and last modification time for a file. @@ -62,9 +63,9 @@ public interface GridGgfsHadoop { * @param path Path to update times. * @param accessTime Last access time to set. * @param modificationTime Last modification time to set. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public Boolean setTimes(IgniteFsPath path, long accessTime, long modificationTime) throws GridException, + public Boolean setTimes(IgniteFsPath path, long accessTime, long modificationTime) throws IgniteCheckedException, IOException; /** @@ -73,9 +74,9 @@ public interface GridGgfsHadoop { * @param src Source path. * @param dest Destination path. * @return Future for rename operation. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public Boolean rename(IgniteFsPath src, IgniteFsPath dest) throws GridException, IOException; + public Boolean rename(IgniteFsPath src, IgniteFsPath dest) throws IgniteCheckedException, IOException; /** * Command to delete given path. @@ -83,9 +84,9 @@ public interface GridGgfsHadoop { * @param path Path to delete. * @param recursive {@code True} if deletion is recursive. * @return Future for delete operation. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public Boolean delete(IgniteFsPath path, boolean recursive) throws GridException, IOException; + public Boolean delete(IgniteFsPath path, boolean recursive) throws IgniteCheckedException, IOException; /** * Command to get affinity for given path, offset and length. @@ -94,9 +95,9 @@ public interface GridGgfsHadoop { * @param start Start position (offset). * @param len Data length. * @return Future for affinity command. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public Collection affinity(IgniteFsPath path, long start, long len) throws GridException, + public Collection affinity(IgniteFsPath path, long start, long len) throws IgniteCheckedException, IOException; /** @@ -104,62 +105,62 @@ public interface GridGgfsHadoop { * * @param path Path to get summary for. * @return Future that will be completed when summary is received. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public IgniteFsPathSummary contentSummary(IgniteFsPath path) throws GridException, IOException; + public IgniteFsPathSummary contentSummary(IgniteFsPath path) throws IgniteCheckedException, IOException; /** * Command to create directories. * * @param path Path to create. * @return Future for mkdirs operation. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public Boolean mkdirs(IgniteFsPath path, Map props) throws GridException, IOException; + public Boolean mkdirs(IgniteFsPath path, Map props) throws IgniteCheckedException, IOException; /** * Command to get list of files in directory. * * @param path Path to list. * @return Future for listFiles operation. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public Collection listFiles(IgniteFsPath path) throws GridException, IOException; + public Collection listFiles(IgniteFsPath path) throws IgniteCheckedException, IOException; /** * Command to get directory listing. * * @param path Path to list. * @return Future for listPaths operation. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public Collection listPaths(IgniteFsPath path) throws GridException, IOException; + public Collection listPaths(IgniteFsPath path) throws IgniteCheckedException, IOException; /** * Performs status request. * * @return Status response. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public GridGgfsStatus fsStatus() throws GridException, IOException; + public GridGgfsStatus fsStatus() throws IgniteCheckedException, IOException; /** * Command to open file for reading. * * @param path File path to open. * @return Future for open operation. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public GridGgfsHadoopStreamDelegate open(IgniteFsPath path) throws GridException, IOException; + public GridGgfsHadoopStreamDelegate open(IgniteFsPath path) throws IgniteCheckedException, IOException; /** * Command to open file for reading. * * @param path File path to open. * @return Future for open operation. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public GridGgfsHadoopStreamDelegate open(IgniteFsPath path, int seqReadsBeforePrefetch) throws GridException, + public GridGgfsHadoopStreamDelegate open(IgniteFsPath path, int seqReadsBeforePrefetch) throws IgniteCheckedException, IOException; /** @@ -171,10 +172,10 @@ public interface GridGgfsHadoop { * @param replication Replication factor. * @param props File properties for creation. * @return Stream descriptor. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ public GridGgfsHadoopStreamDelegate create(IgniteFsPath path, boolean overwrite, boolean colocate, - int replication, long blockSize, @Nullable Map props) throws GridException, IOException; + int replication, long blockSize, @Nullable Map props) throws IgniteCheckedException, IOException; /** * Open file for output appending data to the end of a file. @@ -183,8 +184,8 @@ public interface GridGgfsHadoop { * @param create If {@code true}, file will be created if does not exist. * @param props File properties. * @return Stream descriptor. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ public GridGgfsHadoopStreamDelegate append(IgniteFsPath path, boolean create, - @Nullable Map props) throws GridException, IOException; + @Nullable Map props) throws IgniteCheckedException, IOException; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopCommunicationException.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopCommunicationException.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopCommunicationException.java index 04158ed..6e57d1e 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopCommunicationException.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopCommunicationException.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.ggfs.hadoop; +import org.apache.ignite.*; import org.gridgain.grid.*; import java.io.*; @@ -16,7 +17,7 @@ import java.io.*; /** * Communication exception indicating a problem between file system and GGFS instance. */ -public class GridGgfsHadoopCommunicationException extends GridException { +public class GridGgfsHadoopCommunicationException 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/ggfs/hadoop/GridGgfsHadoopEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java index dc22086..87812d8 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java @@ -65,7 +65,7 @@ public class GridGgfsHadoopEndpoint { return new URI(uri.getScheme(), sb.length() != 0 ? sb.toString() : null, endpoint.host(), endpoint.port(), uri.getPath(), uri.getQuery(), uri.getFragment()); } - catch (URISyntaxException | GridException e) { + catch (URISyntaxException | IgniteCheckedException e) { throw new IOException("Failed to normalize URI: " + uri, e); } } @@ -74,9 +74,9 @@ public class GridGgfsHadoopEndpoint { * Constructor. * * @param connStr Connection string. - * @throws GridException If failed to parse connection string. + * @throws IgniteCheckedException If failed to parse connection string. */ - public GridGgfsHadoopEndpoint(@Nullable String connStr) throws GridException { + public GridGgfsHadoopEndpoint(@Nullable String connStr) throws IgniteCheckedException { if (connStr == null) connStr = ""; @@ -107,13 +107,13 @@ public class GridGgfsHadoopEndpoint { else if (authTokens.length == 2) gridName = F.isEmpty(authTokens[1]) ? null : authTokens[1]; else - throw new GridException("Invalid connection string format: " + connStr); + throw new IgniteCheckedException("Invalid connection string format: " + connStr); } hostPort = hostPort(connStr, tokens[1]); } else - throw new GridException("Invalid connection string format: " + connStr); + throw new IgniteCheckedException("Invalid connection string format: " + connStr); host = hostPort.get1(); @@ -128,9 +128,9 @@ public class GridGgfsHadoopEndpoint { * @param connStr Full connection string. * @param hostPortStr Host/port connection string part. * @return Tuple with host and port. - * @throws GridException If failed to parse connection string. + * @throws IgniteCheckedException If failed to parse connection string. */ - private IgniteBiTuple hostPort(String connStr, String hostPortStr) throws GridException { + private IgniteBiTuple hostPort(String connStr, String hostPortStr) throws IgniteCheckedException { String[] tokens = hostPortStr.split(":", -1); String host = tokens[0]; @@ -149,14 +149,14 @@ public class GridGgfsHadoopEndpoint { port = Integer.valueOf(portStr); if (port < 0 || port > 65535) - throw new GridException("Invalid port number: " + connStr); + throw new IgniteCheckedException("Invalid port number: " + connStr); } catch (NumberFormatException e) { - throw new GridException("Invalid port number: " + connStr); + throw new IgniteCheckedException("Invalid port number: " + connStr); } } else - throw new GridException("Invalid connection string format: " + connStr); + throw new IgniteCheckedException("Invalid connection string format: " + connStr); return F.t(host, port); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFSProperties.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFSProperties.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFSProperties.java index 4d6b32a..a693d7b 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFSProperties.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFSProperties.java @@ -10,6 +10,7 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.hadoop.fs.permission.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import java.util.*; @@ -33,9 +34,9 @@ class GridGgfsHadoopFSProperties { * Constructor. * * @param props Properties. - * @throws GridException In case of error. + * @throws IgniteCheckedException In case of error. */ - GridGgfsHadoopFSProperties(Map props) throws GridException { + GridGgfsHadoopFSProperties(Map props) throws IgniteCheckedException { usrName = props.get(PROP_USER_NAME); grpName = props.get(PROP_GROUP_NAME); @@ -46,7 +47,7 @@ class GridGgfsHadoopFSProperties { perm = new FsPermission((short)Integer.parseInt(permStr, 8)); } catch (NumberFormatException ignore) { - throw new GridException("Permissions cannot be parsed: " + permStr); + throw new IgniteCheckedException("Permissions cannot be parsed: " + permStr); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java index 7f6f540..39e1b7e 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java @@ -13,6 +13,7 @@ import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; import org.apache.hadoop.fs.permission.*; import org.apache.hadoop.ipc.*; +import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.gridgain.grid.*; @@ -46,9 +47,9 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto * * @param uri URI of file system. * @param cfgPath Additional path to Hadoop configuration. - * @throws GridException In case of error. + * @throws IgniteCheckedException In case of error. */ - public GridGgfsHadoopFileSystemWrapper(@Nullable String uri, @Nullable String cfgPath) throws GridException { + public GridGgfsHadoopFileSystemWrapper(@Nullable String uri, @Nullable String cfgPath) throws IgniteCheckedException { Configuration cfg = new Configuration(); if (cfgPath != null) @@ -58,7 +59,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto fileSys = uri == null ? FileSystem.get(cfg) : FileSystem.get(new URI(uri), cfg); } catch (IOException | URISyntaxException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } uri = fileSys.getUri().toString(); @@ -138,7 +139,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public boolean exists(IgniteFsPath path) throws GridException { + @Override public boolean exists(IgniteFsPath path) throws IgniteCheckedException { try { return fileSys.exists(convert(path)); } @@ -148,7 +149,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Nullable @Override public IgniteFsFile update(IgniteFsPath path, Map props) throws GridException { + @Nullable @Override public IgniteFsFile update(IgniteFsPath path, Map props) throws IgniteCheckedException { GridGgfsHadoopFSProperties props0 = new GridGgfsHadoopFSProperties(props); try { @@ -167,7 +168,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public void rename(IgniteFsPath src, IgniteFsPath dest) throws GridException { + @Override public void rename(IgniteFsPath src, IgniteFsPath dest) throws IgniteCheckedException { // Delegate to the secondary file system. try { if (!fileSys.rename(convert(src), convert(dest))) @@ -180,7 +181,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public boolean delete(IgniteFsPath path, boolean recursive) throws GridException { + @Override public boolean delete(IgniteFsPath path, boolean recursive) throws IgniteCheckedException { try { return fileSys.delete(convert(path), recursive); } @@ -190,10 +191,10 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public void mkdirs(IgniteFsPath path) throws GridException { + @Override public void mkdirs(IgniteFsPath path) throws IgniteCheckedException { try { if (!fileSys.mkdirs(convert(path))) - throw new GridException("Failed to make directories [path=" + path + "]"); + throw new IgniteCheckedException("Failed to make directories [path=" + path + "]"); } catch (IOException e) { throw handleSecondaryFsError(e, "Failed to make directories [path=" + path + "]"); @@ -201,10 +202,10 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public void mkdirs(IgniteFsPath path, @Nullable Map props) throws GridException { + @Override public void mkdirs(IgniteFsPath path, @Nullable Map props) throws IgniteCheckedException { try { if (!fileSys.mkdirs(convert(path), new GridGgfsHadoopFSProperties(props).permission())) - throw new GridException("Failed to make directories [path=" + path + ", props=" + props + "]"); + throw new IgniteCheckedException("Failed to make directories [path=" + path + ", props=" + props + "]"); } catch (IOException e) { throw handleSecondaryFsError(e, "Failed to make directories [path=" + path + ", props=" + props + "]"); @@ -212,7 +213,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public Collection listPaths(IgniteFsPath path) throws GridException { + @Override public Collection listPaths(IgniteFsPath path) throws IgniteCheckedException { try { FileStatus[] statuses = fileSys.listStatus(convert(path)); @@ -235,7 +236,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public Collection listFiles(IgniteFsPath path) throws GridException { + @Override public Collection listFiles(IgniteFsPath path) throws IgniteCheckedException { try { FileStatus[] statuses = fileSys.listStatus(convert(path)); @@ -268,7 +269,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public OutputStream create(IgniteFsPath path, boolean overwrite) throws GridException { + @Override public OutputStream create(IgniteFsPath path, boolean overwrite) throws IgniteCheckedException { try { return fileSys.create(convert(path), overwrite); } @@ -279,7 +280,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto /** {@inheritDoc} */ @Override public OutputStream create(IgniteFsPath path, int bufSize, boolean overwrite, int replication, - long blockSize, @Nullable Map props) throws GridException { + long blockSize, @Nullable Map props) throws IgniteCheckedException { GridGgfsHadoopFSProperties props0 = new GridGgfsHadoopFSProperties(props != null ? props : Collections.emptyMap()); @@ -296,7 +297,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto /** {@inheritDoc} */ @Override public OutputStream append(IgniteFsPath path, int bufSize, boolean create, - @Nullable Map props) throws GridException { + @Nullable Map props) throws IgniteCheckedException { try { return fileSys.append(convert(path), bufSize); } @@ -306,7 +307,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public IgniteFsFile info(final IgniteFsPath path) throws GridException { + @Override public IgniteFsFile info(final IgniteFsPath path) throws IgniteCheckedException { try { final FileStatus status = fileSys.getFileStatus(convert(path)); @@ -379,7 +380,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public long usedSpaceSize() throws GridException { + @Override public long usedSpaceSize() throws IgniteCheckedException { try { return fileSys.getContentSummary(new Path(fileSys.getUri())).getSpaceConsumed(); } @@ -394,12 +395,12 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto } /** {@inheritDoc} */ - @Override public void close() throws GridException { + @Override public void close() throws IgniteCheckedException { try { fileSys.close(); } 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/ggfs/hadoop/GridGgfsHadoopInProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java index 0729023..06e16a5 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java @@ -10,6 +10,7 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.commons.logging.*; +import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.ggfs.*; @@ -64,7 +65,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { try { lsnr.onClose(); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (log.isDebugEnabled()) log.debug("Failed to notify stream event listener", e); } @@ -72,7 +73,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public IgniteFsFile info(IgniteFsPath path) throws GridException { + @Override public IgniteFsFile info(IgniteFsPath path) throws IgniteCheckedException { try { return ggfs.info(path); } @@ -82,7 +83,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public IgniteFsFile update(IgniteFsPath path, Map props) throws GridException { + @Override public IgniteFsFile update(IgniteFsPath path, Map props) throws IgniteCheckedException { try { return ggfs.update(path, props); } @@ -92,7 +93,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public Boolean setTimes(IgniteFsPath path, long accessTime, long modificationTime) throws GridException { + @Override public Boolean setTimes(IgniteFsPath path, long accessTime, long modificationTime) throws IgniteCheckedException { try { ggfs.setTimes(path, accessTime, modificationTime); @@ -105,7 +106,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public Boolean rename(IgniteFsPath src, IgniteFsPath dest) throws GridException { + @Override public Boolean rename(IgniteFsPath src, IgniteFsPath dest) throws IgniteCheckedException { try { ggfs.rename(src, dest); @@ -117,7 +118,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public Boolean delete(IgniteFsPath path, boolean recursive) throws GridException { + @Override public Boolean delete(IgniteFsPath path, boolean recursive) throws IgniteCheckedException { try { return ggfs.delete(path, recursive); } @@ -127,7 +128,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public GridGgfsStatus fsStatus() throws GridException { + @Override public GridGgfsStatus fsStatus() throws IgniteCheckedException { try { return ggfs.globalSpace(); } @@ -138,7 +139,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public Collection listPaths(IgniteFsPath path) throws GridException { + @Override public Collection listPaths(IgniteFsPath path) throws IgniteCheckedException { try { return ggfs.listPaths(path); } @@ -148,7 +149,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public Collection listFiles(IgniteFsPath path) throws GridException { + @Override public Collection listFiles(IgniteFsPath path) throws IgniteCheckedException { try { return ggfs.listFiles(path); } @@ -158,7 +159,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public Boolean mkdirs(IgniteFsPath path, Map props) throws GridException { + @Override public Boolean mkdirs(IgniteFsPath path, Map props) throws IgniteCheckedException { try { ggfs.mkdirs(path, props); @@ -171,7 +172,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public IgniteFsPathSummary contentSummary(IgniteFsPath path) throws GridException { + @Override public IgniteFsPathSummary contentSummary(IgniteFsPath path) throws IgniteCheckedException { try { return ggfs.summary(path); } @@ -183,7 +184,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { /** {@inheritDoc} */ @Override public Collection affinity(IgniteFsPath path, long start, long len) - throws GridException { + throws IgniteCheckedException { try { return ggfs.affinity(path, start, len); } @@ -193,7 +194,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public GridGgfsHadoopStreamDelegate open(IgniteFsPath path) throws GridException { + @Override public GridGgfsHadoopStreamDelegate open(IgniteFsPath path) throws IgniteCheckedException { try { GridGgfsInputStreamAdapter stream = ggfs.open(path, bufSize); @@ -206,7 +207,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { /** {@inheritDoc} */ @Override public GridGgfsHadoopStreamDelegate open(IgniteFsPath path, int seqReadsBeforePrefetch) - throws GridException { + throws IgniteCheckedException { try { GridGgfsInputStreamAdapter stream = ggfs.open(path, bufSize, seqReadsBeforePrefetch); @@ -219,7 +220,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { /** {@inheritDoc} */ @Override public GridGgfsHadoopStreamDelegate create(IgniteFsPath path, boolean overwrite, boolean colocate, - int replication, long blockSize, @Nullable Map props) throws GridException { + int replication, long blockSize, @Nullable Map props) throws IgniteCheckedException { try { IgniteFsOutputStream stream = ggfs.create(path, bufSize, overwrite, colocate ? ggfs.nextAffinityKey() : null, replication, blockSize, props); @@ -233,7 +234,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { /** {@inheritDoc} */ @Override public GridGgfsHadoopStreamDelegate append(IgniteFsPath path, boolean create, - @Nullable Map props) throws GridException { + @Nullable Map props) throws IgniteCheckedException { try { IgniteFsOutputStream stream = ggfs.append(path, bufSize, create, props); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInputStream.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInputStream.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInputStream.java index 008c010..f6d99b4 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInputStream.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInputStream.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.commons.logging.*; import org.apache.hadoop.fs.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.ggfs.common.*; import org.gridgain.grid.util.lang.*; @@ -142,7 +143,7 @@ public final class GridGgfsHadoopInputStream extends InputStream implements Seek return res; } - catch (GridException e) { + catch (IgniteCheckedException e) { throw GridGgfsHadoopUtils.cast(e); } finally { @@ -182,7 +183,7 @@ public final class GridGgfsHadoopInputStream extends InputStream implements Seek return read; } - catch (GridException e) { + catch (IgniteCheckedException e) { throw GridGgfsHadoopUtils.cast(e); } finally { @@ -313,7 +314,7 @@ public final class GridGgfsHadoopInputStream extends InputStream implements Seek if (clientLog.isLogEnabled()) clientLog.logRandomRead(logStreamId, position, len); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw GridGgfsHadoopUtils.cast(e); } finally { @@ -435,9 +436,9 @@ public final class GridGgfsHadoopInputStream extends InputStream implements Seek * @param dstOff Offset in destination buffer from which start writing. * @param len Maximum number of bytes to copy. * @return Number of bytes copied. - * @throws GridException If read future failed. + * @throws IgniteCheckedException If read future failed. */ - public int flatten(byte[] dst, long pos, int dstOff, int len) throws GridException { + public int flatten(byte[] dst, long pos, int dstOff, int len) throws IgniteCheckedException { // If read start position is within cached boundaries. if (contains(pos)) { byte[] data = readFut.get(); @@ -486,9 +487,9 @@ public final class GridGgfsHadoopInputStream extends InputStream implements Seek * @param dstOff Destination buffer offset. * @param len Maximum number of bytes to copy. * @return Number of bytes copied. - * @throws GridException If any read operation failed. + * @throws IgniteCheckedException If any read operation failed. */ - public int flatten(byte[] dst, long pos, int dstOff, int len) throws GridException { + public int flatten(byte[] dst, long pos, int dstOff, int len) throws IgniteCheckedException { assert dstOff >= 0; assert dstOff + len <= dst.length : "Invalid indices [dst.length=" + dst.length + ", dstOff=" + dstOff + ", len=" + len + ']'; @@ -513,9 +514,9 @@ public final class GridGgfsHadoopInputStream extends InputStream implements Seek * * @param pos Stream position. * @return Read byte. - * @throws GridException If read failed. + * @throws IgniteCheckedException If read failed. */ - public int atPosition(long pos) throws GridException { + public int atPosition(long pos) throws IgniteCheckedException { // Should not reach here if stream contains no data. assert first != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIo.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIo.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIo.java index 8a59709..6ca6904 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIo.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIo.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.ggfs.hadoop; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.ggfs.common.*; import org.gridgain.grid.util.lang.*; @@ -24,9 +25,9 @@ public interface GridGgfsHadoopIo { * * @param msg Message to send. * @return Future that will be completed. - * @throws GridException If a message cannot be sent (connection is broken or client was closed). + * @throws IgniteCheckedException If a message cannot be sent (connection is broken or client was closed). */ - public GridPlainFuture send(GridGgfsMessage msg) throws GridException; + public GridPlainFuture send(GridGgfsMessage msg) throws IgniteCheckedException; /** * Sends given GGFS client message and asynchronously awaits for response. When IO detects response @@ -38,18 +39,18 @@ public interface GridGgfsHadoopIo { * @param outOff Output buffer offset. * @param outLen Output buffer length. * @return Future that will be completed when response is returned from closure. - * @throws GridException If a message cannot be sent (connection is broken or client was closed). + * @throws IgniteCheckedException If a message cannot be sent (connection is broken or client was closed). */ public GridPlainFuture send(GridGgfsMessage msg, @Nullable byte[] outBuf, int outOff, int outLen) - throws GridException; + throws IgniteCheckedException; /** * Sends given message and does not wait for response. * * @param msg Message to send. - * @throws GridException If send failed. + * @throws IgniteCheckedException If send failed. */ - public void sendPlain(GridGgfsMessage msg) throws GridException; + public void sendPlain(GridGgfsMessage msg) throws IgniteCheckedException; /** * Adds event listener that will be invoked when connection with server is lost or remote error has occurred. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java index 3cb2639..c1fcd7f 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java @@ -10,6 +10,7 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.commons.logging.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.ggfs.common.*; @@ -133,7 +134,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { try { clientIo.start(); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new IOException(e.getMessage(), e); } @@ -222,9 +223,9 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { /** * Starts the IO. * - * @throws GridException If failed to connect the endpoint. + * @throws IgniteCheckedException If failed to connect the endpoint. */ - private void start() throws GridException { + private void start() throws IgniteCheckedException { boolean success = false; try { @@ -242,11 +243,11 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { success = true; } - catch (GridException e) { + catch (IgniteCheckedException e) { GridIpcOutOfSystemResourcesException resEx = e.getCause(GridIpcOutOfSystemResourcesException.class); if (resEx != null) - throw new GridException(GridIpcSharedMemoryServerEndpoint.OUT_OF_RESOURCES_MSG, resEx); + throw new IgniteCheckedException(GridIpcSharedMemoryServerEndpoint.OUT_OF_RESOURCES_MSG, resEx); throw e; } @@ -308,13 +309,13 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { } /** {@inheritDoc} */ - @Override public GridPlainFuture send(GridGgfsMessage msg) throws GridException { + @Override public GridPlainFuture send(GridGgfsMessage msg) throws IgniteCheckedException { return send(msg, null, 0, 0); } /** {@inheritDoc} */ @Override public GridPlainFuture send(GridGgfsMessage msg, @Nullable byte[] outBuf, int outOff, - int outLen) throws GridException { + int outLen) throws IgniteCheckedException { assert outBuf == null || msg.command() == GridGgfsIpcCommand.READ_BLOCK; if (!busyLock.readLock().tryLock()) @@ -344,7 +345,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { byte[] hdr = GridGgfsMarshaller.createHeader(reqId, msg.command()); - GridException err = null; + IgniteCheckedException err = null; try { synchronized (this) { @@ -353,7 +354,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { out.flush(); // Blocking operation + sometimes system call. } } - catch (GridException e) { + catch (IgniteCheckedException e) { err = e; } catch (IOException e) { @@ -374,7 +375,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { } /** {@inheritDoc} */ - @Override public void sendPlain(GridGgfsMessage msg) throws GridException { + @Override public void sendPlain(GridGgfsMessage msg) throws IgniteCheckedException { if (!busyLock.readLock().tryLock()) throw new GridGgfsHadoopCommunicationException("Failed to send message (client is being " + "concurrently closed)."); @@ -426,7 +427,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { } if (err == null) - err = new GridException("Failed to perform request (connection was concurrently closed before response " + + err = new IgniteCheckedException("Failed to perform request (connection was concurrently closed before response " + "is received)."); // Clean up resources. @@ -499,7 +500,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { log.warn(msg); - err = new GridException(msg); + err = new IgniteCheckedException(msg); break; } @@ -549,7 +550,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { fut.onDone(res); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (log.isDebugEnabled()) log.debug("Failed to apply response closure (will fail request future): " + e.getMessage()); @@ -563,7 +564,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { } } catch (EOFException ignored) { - err = new GridException("Failed to read response from server (connection was closed by remote peer)."); + err = new IgniteCheckedException("Failed to read response from server (connection was closed by remote peer)."); } catch (IOException e) { if (!stopping) @@ -571,7 +572,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { err = new GridGgfsHadoopCommunicationException(e); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (!stopping) log.error("Failed to obtain endpoint input stream (connection will be closed)", e);