Repository: spark Updated Branches: refs/heads/master c3f2a8588 -> 9b56e249e
[SPARK-3690] Closing shuffle writers we swallow more important exception Author: epahomov <[email protected]> Closes #2537 from epahomov/SPARK-3690 and squashes the following commits: a0b7de4 [epahomov] [SPARK-3690] Closing shuffle writers we swallow more important exception Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9b56e249 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9b56e249 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9b56e249 Branch: refs/heads/master Commit: 9b56e249e09d8da20f703b9381c5c3c8a1a1d4a9 Parents: c3f2a85 Author: epahomov <[email protected]> Authored: Thu Sep 25 14:50:12 2014 -0700 Committer: Josh Rosen <[email protected]> Committed: Thu Sep 25 14:50:12 2014 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/scheduler/ShuffleMapTask.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/9b56e249/core/src/main/scala/org/apache/spark/scheduler/ShuffleMapTask.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/scheduler/ShuffleMapTask.scala b/core/src/main/scala/org/apache/spark/scheduler/ShuffleMapTask.scala index 381eff2..a98ee11 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/ShuffleMapTask.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/ShuffleMapTask.scala @@ -69,8 +69,13 @@ private[spark] class ShuffleMapTask( return writer.stop(success = true).get } catch { case e: Exception => - if (writer != null) { - writer.stop(success = false) + try { + if (writer != null) { + writer.stop(success = false) + } + } catch { + case e: Exception => + log.debug("Could not stop writer", e) } throw e } finally { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
