You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2014/09/04 16:48:44 UTC
git commit: Disable merging of Iteration Aux Tasks
Repository: incubator-flink
Updated Branches:
refs/heads/master dac281f40 -> 80af60b98
Disable merging of Iteration Aux Tasks
This will become obsolete once we have buffer oriented execution.
Disable it for now because it is causing a bug: FLINK-1087
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/80af60b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/80af60b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/80af60b9
Branch: refs/heads/master
Commit: 80af60b986f4aaf57ab56b243d3c897dabb0bddd
Parents: dac281f
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Thu Sep 4 16:33:36 2014 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Thu Sep 4 16:33:36 2014 +0200
----------------------------------------------------------------------
.../flink/compiler/plantranslate/NepheleJobGraphGenerator.java | 2 +-
.../java/org/apache/flink/runtime/operators/RegularPactTask.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/80af60b9/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java
----------------------------------------------------------------------
diff --git a/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java
index 1eabb83..fcf9f8d 100644
--- a/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java
+++ b/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java
@@ -101,7 +101,7 @@ public class NepheleJobGraphGenerator implements Visitor<PlanNode> {
public static final String MERGE_ITERATION_AUX_TASKS_KEY = "compiler.merge-iteration-aux";
- private static final boolean mergeIterationAuxTasks = GlobalConfiguration.getBoolean(MERGE_ITERATION_AUX_TASKS_KEY, true);
+ private static final boolean mergeIterationAuxTasks = GlobalConfiguration.getBoolean(MERGE_ITERATION_AUX_TASKS_KEY, false);
// private static final Log LOG = LogFactory.getLog(NepheleJobGraphGenerator.class);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/80af60b9/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
index e8d7add..f884df1 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
@@ -256,8 +256,8 @@ public class RegularPactTask<S extends Function, OT> extends AbstractInvokable i
initInputReaders();
initBroadcastInputReaders();
} catch (Exception e) {
- throw new RuntimeException("Initializing the input streams failed" +
- e.getMessage() == null ? "." : ": " + e.getMessage(), e);
+ throw new RuntimeException("Initializing the input streams failed in Task " + getEnvironment().getTaskName() +
+ (e.getMessage() == null ? "." : ": " + e.getMessage()), e);
}
// initialize the writers. this is necessary for nephele to create the output gates.