Repository: spark
Updated Branches:
refs/heads/branch-1.0 08c4d1112 -> bc3bfeaff
[Bugfix] Tachyon file cleanup logical error
Should lookup `shutdownDeleteTachyonPaths` instead of `shutdownDeletePaths`.
Together with a minor style clean up: `find {...}.isDefined` to `exists {...}`.
Author: Cheng Lian <[email protected]>
Closes #575 from liancheng/tachyonFix and squashes the following commits:
deb8f31 [Cheng Lian] Fixed logical error in when cleanup Tachyon files and
minor style cleanup
(cherry picked from commit ce72c72aecdcf50e031f0dd1a5ef0e6dbf8f40b5)
Signed-off-by: Patrick Wendell <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bc3bfeaf
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bc3bfeaf
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bc3bfeaf
Branch: refs/heads/branch-1.0
Commit: bc3bfeaff63b99d05054989609adc4da84e48e36
Parents: 08c4d11
Author: Cheng Lian <[email protected]>
Authored: Sat May 3 13:23:52 2014 -0700
Committer: Patrick Wendell <[email protected]>
Committed: Sat May 3 13:24:03 2014 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/util/Utils.scala | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/bc3bfeaf/core/src/main/scala/org/apache/spark/util/Utils.scala
----------------------------------------------------------------------
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 536a740..acd7eef 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -220,9 +220,9 @@ private[spark] object Utils extends Logging {
def hasRootAsShutdownDeleteDir(file: File): Boolean = {
val absolutePath = file.getAbsolutePath()
val retval = shutdownDeletePaths.synchronized {
- shutdownDeletePaths.find { path =>
+ shutdownDeletePaths.exists { path =>
!absolutePath.equals(path) && absolutePath.startsWith(path)
- }.isDefined
+ }
}
if (retval) {
logInfo("path = " + file + ", already present as root for deletion.")
@@ -235,10 +235,10 @@ private[spark] object Utils extends Logging {
// paths - resulting in Exception and incomplete cleanup.
def hasRootAsShutdownDeleteDir(file: TachyonFile): Boolean = {
val absolutePath = file.getPath()
- val retval = shutdownDeletePaths.synchronized {
- shutdownDeletePaths.find { path =>
+ val retval = shutdownDeleteTachyonPaths.synchronized {
+ shutdownDeleteTachyonPaths.exists { path =>
!absolutePath.equals(path) && absolutePath.startsWith(path)
- }.isDefined
+ }
}
if (retval) {
logInfo("path = " + file + ", already present as root for deletion.")
