Repository: tez Updated Branches: refs/heads/master a4a3c6dce -> 14cc28275
TEZ-3833. Tasks should report codec errors during shuffle as fetch failures. Contributed by Kuhu Shukla Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/14cc2827 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/14cc2827 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/14cc2827 Branch: refs/heads/master Commit: 14cc28275f35bfa8c3316d12508cfd54363062c0 Parents: a4a3c6d Author: Jason Lowe <[email protected]> Authored: Fri Sep 29 12:57:58 2017 -0500 Committer: Jason Lowe <[email protected]> Committed: Fri Sep 29 12:57:58 2017 -0500 ---------------------------------------------------------------------- .../org/apache/tez/runtime/library/common/shuffle/Fetcher.java | 6 +++--- .../common/shuffle/orderedgrouped/FetcherOrderedGrouped.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/14cc2827/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.java index 9f657e5..a3bbeca 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.java @@ -683,7 +683,7 @@ public class Fetcher extends CallableWithNdc<FetchResult> { long endTime = System.currentTimeMillis(); fetcherCallback.fetchSucceeded(host, srcAttemptId, fetchedInput, idxRecord.getPartLength(), idxRecord.getRawLength(), (endTime - startTime)); - } catch (IOException e) { + } catch (IOException | InternalError e) { hasFailures = true; cleanupFetchedInput(fetchedInput); if (isShutDown.get()) { @@ -980,7 +980,7 @@ public class Fetcher extends CallableWithNdc<FetchResult> { // metrics.successFetch(); } srcAttemptsRemaining.remove(inputAttemptIdentifier.toString()); - } catch (IOException ioe) { + } catch (IOException | InternalError ioe) { if (isShutDown.get()) { cleanupFetchedInput(fetchedInput); if (isDebugEnabled) { @@ -1037,7 +1037,7 @@ public class Fetcher extends CallableWithNdc<FetchResult> { * @return true to indicate connection retry. false otherwise. * @throws IOException */ - private boolean shouldRetry(InputAttemptIdentifier srcAttemptId, IOException ioe) { + private boolean shouldRetry(InputAttemptIdentifier srcAttemptId, Throwable ioe) { if (!(ioe instanceof SocketTimeoutException)) { return false; } http://git-wip-us.apache.org/repos/asf/tez/blob/14cc2827/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/FetcherOrderedGrouped.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/FetcherOrderedGrouped.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/FetcherOrderedGrouped.java index 68a54e9..af9b929 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/FetcherOrderedGrouped.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/FetcherOrderedGrouped.java @@ -565,7 +565,7 @@ class FetcherOrderedGrouped extends CallableWithNdc<Void> { endTime - startTime, mapOutput, false); } remaining.remove(inputAttemptIdentifier.toString()); - } catch(IOException ioe) { + } catch(IOException | InternalError ioe) { if (stopped) { if (LOG.isDebugEnabled()) { LOG.debug("Not reporting fetch failure for exception during data copy: [" @@ -614,7 +614,7 @@ class FetcherOrderedGrouped extends CallableWithNdc<Void> { * @return true to indicate connection retry. false otherwise. * @throws IOException */ - private boolean shouldRetry(MapHost host, IOException ioe) { + private boolean shouldRetry(MapHost host, Throwable ioe) { if (!(ioe instanceof SocketTimeoutException)) { return false; } @@ -723,7 +723,7 @@ class FetcherOrderedGrouped extends CallableWithNdc<Void> { long endTime = System.currentTimeMillis(); scheduler.copySucceeded(srcAttemptId, host, indexRecord.getPartLength(), indexRecord.getRawLength(), (endTime - startTime), mapOutput, true); - } catch (IOException e) { + } catch (IOException | InternalError e) { if (mapOutput != null) { mapOutput.abort(); }
