Repository: spark Updated Branches: refs/heads/master 1f1fccc5c -> d334bfbcf
[SPARK-6132][HOTFIX] ContextCleaner InterruptedException should be quiet If the cleaner is stopped, we shouldn't print a huge stack trace when the cleaner thread is interrupted because we purposefully did this. Author: Andrew Or <and...@databricks.com> Closes #4882 from andrewor14/cleaner-interrupt and squashes the following commits: 8652120 [Andrew Or] Just a hot fix Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d334bfbc Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d334bfbc Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d334bfbc Branch: refs/heads/master Commit: d334bfbcf38d0c1c6835e72bc85e42196e295744 Parents: 1f1fccc Author: Andrew Or <and...@databricks.com> Authored: Tue Mar 3 20:49:45 2015 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Tue Mar 3 20:49:45 2015 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/ContextCleaner.scala | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d334bfbc/core/src/main/scala/org/apache/spark/ContextCleaner.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/ContextCleaner.scala b/core/src/main/scala/org/apache/spark/ContextCleaner.scala index 4dab886..0c59a61 100644 --- a/core/src/main/scala/org/apache/spark/ContextCleaner.scala +++ b/core/src/main/scala/org/apache/spark/ContextCleaner.scala @@ -168,6 +168,7 @@ private[spark] class ContextCleaner(sc: SparkContext) extends Logging { } } } catch { + case ie: InterruptedException if stopped => // ignore case e: Exception => logError("Error in cleaning thread", e) } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org