aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxukun 00228947 <xukun.xu@huawei.com>2015-02-17 18:59:41 +0000
committerSean Owen <sowen@cloudera.com>2015-02-17 18:59:51 +0000
commit420bc9b3ae49883f17962b1cff18a3b8df3bd05c (patch)
tree06e4c10b15e9b0641f977e099ef96f91c2e5e678
parent2bf2b56ef0c0fbb4cead030e44910453b2cbb6fd (diff)
downloadspark-420bc9b3ae49883f17962b1cff18a3b8df3bd05c.tar.gz
spark-420bc9b3ae49883f17962b1cff18a3b8df3bd05c.tar.bz2
spark-420bc9b3ae49883f17962b1cff18a3b8df3bd05c.zip
[SPARK-5661]function hasShutdownDeleteTachyonDir should use shutdownDeleteTachyonPaths to determine whether contains file
hasShutdownDeleteTachyonDir(file: TachyonFile) should use shutdownDeleteTachyonPaths(not shutdownDeletePaths) to determine Whether contain file. To solve it ,delete two unused function. Author: xukun 00228947 <xukun.xu@huawei.com> Author: viper-kun <xukun.xu@huawei.com> Closes #4418 from viper-kun/deleteunusedfun and squashes the following commits: 87340eb [viper-kun] fix style 3d6c69e [xukun 00228947] fix bug 2bc397e [xukun 00228947] deleteunusedfun (cherry picked from commit b271c265b742fa6947522eda4592e9e6a7fd1f3a) Signed-off-by: Sean Owen <sowen@cloudera.com>
-rw-r--r--core/src/main/scala/org/apache/spark/util/Utils.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala
index c06bd6fab0..df21ed37e7 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -213,8 +213,8 @@ private[spark] object Utils extends Logging {
// Is the path already registered to be deleted via a shutdown hook ?
def hasShutdownDeleteTachyonDir(file: TachyonFile): Boolean = {
val absolutePath = file.getPath()
- shutdownDeletePaths.synchronized {
- shutdownDeletePaths.contains(absolutePath)
+ shutdownDeleteTachyonPaths.synchronized {
+ shutdownDeleteTachyonPaths.contains(absolutePath)
}
}