You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2014/03/24 19:11:16 UTC
git commit: TEZ-971. Change Shuffle to report errors early rather
than waiting for access before reporting them. (sseth)
Repository: incubator-tez
Updated Branches:
refs/heads/master 7f3051b1f -> 8fab9244f
TEZ-971. Change Shuffle to report errors early rather than waiting for
access before reporting them. (sseth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/8fab9244
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/8fab9244
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/8fab9244
Branch: refs/heads/master
Commit: 8fab9244f6cd82bb3160c006f865c026b30dc56c
Parents: 7f3051b
Author: Siddharth Seth <ss...@apache.org>
Authored: Mon Mar 24 11:10:42 2014 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Mon Mar 24 11:10:42 2014 -0700
----------------------------------------------------------------------
.../tez/runtime/library/common/shuffle/impl/Shuffle.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8fab9244/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
index 6c4471c..1bc3903 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
@@ -251,8 +251,8 @@ public class Shuffle implements ExceptionReporter, MemoryUpdateCallback {
while (!scheduler.waitUntilDone(PROGRESS_FREQUENCY)) {
synchronized (this) {
if (throwable != null) {
- // This exception will show up when someone tries iterating through the fetched Input.
- // As part of TEZ-919, report this early.
+ inputContext.fatalError(throwable, "error in shuffle from thread :"
+ + throwingThreadName);
throw new ShuffleError("error in shuffle in " + throwingThreadName,
throwable);
}
@@ -274,12 +274,15 @@ public class Shuffle implements ExceptionReporter, MemoryUpdateCallback {
try {
kvIter = merger.close();
} catch (Throwable e) {
+ inputContext.fatalError(e, "Error while doing final merge ");
throw new ShuffleError("Error while doing final merge " , e);
}
// Sanity check
synchronized (Shuffle.this) {
if (throwable != null) {
+ inputContext.fatalError(throwable, "error in shuffle from thread :"
+ + throwingThreadName);
throw new ShuffleError("error in shuffle in " + throwingThreadName,
throwable);
}