diff options
author | Andrew Or <andrew@databricks.com> | 2015-03-03 20:49:45 -0800 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2015-03-03 20:49:45 -0800 |
commit | d334bfbcf38d0c1c6835e72bc85e42196e295744 (patch) | |
tree | e1c57d954efb206119843404d3429c1bc9fefff2 /core | |
parent | 1f1fccc5ceb0c5b7656a0594be3a67bd3b432e85 (diff) | |
download | spark-d334bfbcf38d0c1c6835e72bc85e42196e295744.tar.gz spark-d334bfbcf38d0c1c6835e72bc85e42196e295744.tar.bz2 spark-d334bfbcf38d0c1c6835e72bc85e42196e295744.zip |
[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 <andrew@databricks.com>
Closes #4882 from andrewor14/cleaner-interrupt and squashes the following commits:
8652120 [Andrew Or] Just a hot fix
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/scala/org/apache/spark/ContextCleaner.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/ContextCleaner.scala b/core/src/main/scala/org/apache/spark/ContextCleaner.scala index 4dab886698..0c59a61e81 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) } } |