# IGNITE-405: Disabled external executino and removed it from public API.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dab66dc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dab66dc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dab66dc1 Branch: refs/heads/ignite-329 Commit: dab66dc1b8b755f03ac3675b9193424791d7324b Parents: 40b96e1 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Mar 10 13:27:33 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Mar 10 13:29:18 2015 +0300 ---------------------------------------------------------------------- .../ignite/configuration/HadoopConfiguration.java | 17 ++++++++++------- .../processors/hadoop/HadoopProcessor.java | 4 +++- .../HadoopClientProtocolEmbeddedSelfTest.java | 3 ++- .../processors/hadoop/HadoopGroupingTest.java | 3 ++- .../hadoop/HadoopJobTrackerSelfTest.java | 4 +++- .../hadoop/HadoopMapReduceEmbeddedSelfTest.java | 3 ++- .../hadoop/HadoopSortingExternalTest.java | 3 ++- .../processors/hadoop/HadoopSortingTest.java | 3 ++- .../hadoop/HadoopTaskExecutionSelfTest.java | 4 +++- .../HadoopExternalTaskExecutionSelfTest.java | 3 ++- .../ignite/testsuites/IgniteHadoopTestSuite.java | 6 +++--- 11 files changed, 34 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java index 01ef8b0..3a7f877 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java @@ -65,7 +65,8 @@ public class HadoopConfiguration { */ public HadoopConfiguration(HadoopConfiguration cfg) { // Preserve alphabetic order. - extExecution = cfg.isExternalExecution(); + // TODO: IGNITE-404: Uncomment when fixed. + //extExecution = cfg.isExternalExecution(); finishedJobInfoTtl = cfg.getFinishedJobInfoTtl(); planner = cfg.getMapReducePlanner(); maxParallelTasks = cfg.getMaxParallelTasks(); @@ -132,9 +133,10 @@ public class HadoopConfiguration { * * @return {@code True} if external execution. */ - public boolean isExternalExecution() { - return extExecution; - } + // TODO: IGNITE-404: Uncomment when fixed. +// public boolean isExternalExecution() { +// return extExecution; +// } /** * Sets external task execution flag. @@ -142,9 +144,10 @@ public class HadoopConfiguration { * @param extExecution {@code True} if tasks should be executed in an external process. * @see #isExternalExecution() */ - public void setExternalExecution(boolean extExecution) { - this.extExecution = extExecution; - } + // TODO: IGNITE-404: Uncomment when fixed. +// public void setExternalExecution(boolean extExecution) { +// this.extExecution = extExecution; +// } /** * Gets Hadoop map-reduce planner, a component which defines job execution plan based on job http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java index e0c5916..9bb6a0e 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java @@ -91,7 +91,9 @@ public class HadoopProcessor extends HadoopProcessorAdapter { ctx, cfg, new HadoopJobTracker(), - cfg.isExternalExecution() ? new HadoopExternalTaskExecutor() : new HadoopEmbeddedTaskExecutor(), + new HadoopEmbeddedTaskExecutor(), + // TODO: IGNITE-404: Uncomment when fixed. + //cfg.isExternalExecution() ? new HadoopExternalTaskExecutor() : new HadoopEmbeddedTaskExecutor(), new HadoopShuffle()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/HadoopClientProtocolEmbeddedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/HadoopClientProtocolEmbeddedSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/HadoopClientProtocolEmbeddedSelfTest.java index ffa20d1..a546559 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/HadoopClientProtocolEmbeddedSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/HadoopClientProtocolEmbeddedSelfTest.java @@ -27,7 +27,8 @@ public class HadoopClientProtocolEmbeddedSelfTest extends HadoopClientProtocolSe @Override public HadoopConfiguration hadoopConfiguration(String gridName) { HadoopConfiguration cfg = super.hadoopConfiguration(gridName); - cfg.setExternalExecution(false); + // TODO: IGNITE-404: Uncomment when fixed. + //cfg.setExternalExecution(false); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopGroupingTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopGroupingTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopGroupingTest.java index e385ca7..f2abf12 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopGroupingTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopGroupingTest.java @@ -64,7 +64,8 @@ public class HadoopGroupingTest extends HadoopAbstractSelfTest { @Override public HadoopConfiguration hadoopConfiguration(String gridName) { HadoopConfiguration cfg = super.hadoopConfiguration(gridName); - cfg.setExternalExecution(false); + // TODO: IGNITE-404: Uncomment when fixed. + //cfg.setExternalExecution(false); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopJobTrackerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopJobTrackerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopJobTrackerSelfTest.java index 943d89f..6cf0e5e 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopJobTrackerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopJobTrackerSelfTest.java @@ -96,7 +96,9 @@ public class HadoopJobTrackerSelfTest extends HadoopAbstractSelfTest { HadoopConfiguration cfg = super.hadoopConfiguration(gridName); cfg.setMapReducePlanner(new HadoopTestRoundRobinMrPlanner()); - cfg.setExternalExecution(false); + + // TODO: IGNITE-404: Uncomment when fixed. + //cfg.setExternalExecution(false); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java index 4a6e1ef..a329a95 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java @@ -46,7 +46,8 @@ public class HadoopMapReduceEmbeddedSelfTest extends HadoopMapReduceTest { @Override public HadoopConfiguration hadoopConfiguration(String gridName) { HadoopConfiguration cfg = super.hadoopConfiguration(gridName); - cfg.setExternalExecution(false); + // TODO: IGNITE-404: Uncomment when fixed. + //cfg.setExternalExecution(false); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingExternalTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingExternalTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingExternalTest.java index 772e77d..05c90e3 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingExternalTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingExternalTest.java @@ -27,7 +27,8 @@ public class HadoopSortingExternalTest extends HadoopSortingTest { @Override public HadoopConfiguration hadoopConfiguration(String gridName) { HadoopConfiguration cfg = super.hadoopConfiguration(gridName); - cfg.setExternalExecution(true); + // TODO: IGNITE-404: Uncomment when fixed. + //cfg.setExternalExecution(true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingTest.java index 3f6594a..1005de0 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingTest.java @@ -68,7 +68,8 @@ public class HadoopSortingTest extends HadoopAbstractSelfTest { @Override public HadoopConfiguration hadoopConfiguration(String gridName) { HadoopConfiguration cfg = super.hadoopConfiguration(gridName); - cfg.setExternalExecution(false); + // TODO: IGNITE-404: Uncomment when fixed. + //cfg.setExternalExecution(false); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskExecutionSelfTest.java index 20c5db2..0107907 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskExecutionSelfTest.java @@ -109,7 +109,9 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest { HadoopConfiguration cfg = super.hadoopConfiguration(gridName); cfg.setMaxParallelTasks(5); - cfg.setExternalExecution(false); + + // TODO: IGNITE-404: Uncomment when fixed. + //cfg.setExternalExecution(false); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java index 59ac445..15f16d9 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java @@ -58,7 +58,8 @@ public class HadoopExternalTaskExecutionSelfTest extends HadoopAbstractSelfTest @Override public HadoopConfiguration hadoopConfiguration(String gridName) { HadoopConfiguration cfg = super.hadoopConfiguration(gridName); - cfg.setExternalExecution(true); + // TODO: IGNITE-404: Uncomment when fixed. + //cfg.setExternalExecution(true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab66dc1/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java index 4790e63..4d2a4b6 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java @@ -106,11 +106,11 @@ public class IgniteHadoopTestSuite extends TestSuite { suite.addTest(new TestSuite(ldr.loadClass(HadoopMapReduceEmbeddedSelfTest.class.getName()))); - suite.addTest(new TestSuite(ldr.loadClass(HadoopExternalTaskExecutionSelfTest.class.getName()))); - suite.addTest(new TestSuite(ldr.loadClass(HadoopExternalCommunicationSelfTest.class.getName()))); - suite.addTest(new TestSuite(ldr.loadClass(HadoopSortingTest.class.getName()))); + // TODO: IGNITE-404: Uncomment when fixed. + //suite.addTest(new TestSuite(ldr.loadClass(HadoopExternalTaskExecutionSelfTest.class.getName()))); + //suite.addTest(new TestSuite(ldr.loadClass(HadoopExternalCommunicationSelfTest.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(HadoopSortingExternalTest.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(HadoopGroupingTest.class.getName())));
