Repository: spark Updated Branches: refs/heads/branch-1.2 a2a94a154 -> abdcec673
[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/abdcec67 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/abdcec67 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/abdcec67 Branch: refs/heads/branch-1.2 Commit: abdcec673f722151cfde59111cf38a0842cc11ba Parents: 06d883c Author: Andrew Or <and...@databricks.com> Authored: Tue Mar 3 20:49:45 2015 -0800 Committer: Sean Owen <so...@cloudera.com> Committed: Sun Mar 22 13:05:11 2015 +0000 ---------------------------------------------------------------------- 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/abdcec67/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 201e5ec..98e4401 100644 --- a/core/src/main/scala/org/apache/spark/ContextCleaner.scala +++ b/core/src/main/scala/org/apache/spark/ContextCleaner.scala @@ -161,6 +161,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
