don't check sparkFilesDir, check executorId

apache · Feb 7, 2015 · f48a3c6 · f48a3c6
1 parent dd9686e
commit f48a3c6
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala
@@ -94,14 +94,11 @@ class SparkEnv (
 
     // Note that blockTransferService is stopped by BlockManager since it is started by it.
 
-    /**
-     * If we only stop sc, but the driver process still run as a services then we need to delete
-     * the tmp dir, if not, it will create too many tmp dirs.
-     *
-     * We only need to delete the tmp dir create by driver, so we need to check the sparkFilesDir,
-     * because sparkFilesDir is point to the current working dir in executor.
-     */
-    if ("." != sparkFilesDir) {
+    // If we only stop sc, but the driver process still run as a services then we need to delete
+    // the tmp dir, if not, it will create too many tmp dirs.
+    // We only need to delete the tmp dir create by driver, because sparkFilesDir is point to the
+    // current working dir in executor which we do not need to delete.
+    if (SparkContext.DRIVER_IDENTIFIER == executorId) {
       try {
         Utils.deleteRecursively(new File(sparkFilesDir))
       } catch {