From 01acd8e9033045d9d5f9d5c230c427a007535cdb Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Thu, 17 Jul 2014 11:11:34 -0700 Subject: [PATCH] Renamed and repackaged ExecutorExitCode.scala properly --- ...cutorExitCode.scala => SparkInternalExitCode.scala} | 4 ++-- .../executor/ExecutorUncaughtExceptionHandler.scala | 10 +++++----- .../apache/spark/scheduler/ExecutorLossReason.scala | 4 ++-- .../org/apache/spark/storage/DiskBlockManager.scala | 5 ++--- .../org/apache/spark/storage/TachyonBlockManager.scala | 7 +++---- 5 files changed, 14 insertions(+), 16 deletions(-) rename core/src/main/scala/org/apache/spark/{executor/ExecutorExitCode.scala => SparkInternalExitCode.scala} (98%) diff --git a/core/src/main/scala/org/apache/spark/executor/ExecutorExitCode.scala b/core/src/main/scala/org/apache/spark/SparkInternalExitCode.scala similarity index 98% rename from core/src/main/scala/org/apache/spark/executor/ExecutorExitCode.scala rename to core/src/main/scala/org/apache/spark/SparkInternalExitCode.scala index 38be2c58b333f..2d9e6a1dd77da 100644 --- a/core/src/main/scala/org/apache/spark/executor/ExecutorExitCode.scala +++ b/core/src/main/scala/org/apache/spark/SparkInternalExitCode.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.spark.executor +package org.apache.spark /** * These are exit codes that executors should use to provide the master with information about @@ -26,7 +26,7 @@ package org.apache.spark.executor * OpenJDK JVM may use exit code 1 in some of its own "last chance" code. */ private[spark] -object ExecutorExitCode { +object SparkInternalExitCode { /** The default uncaught exception handler was reached. */ val UNCAUGHT_EXCEPTION = 50 diff --git a/core/src/main/scala/org/apache/spark/executor/ExecutorUncaughtExceptionHandler.scala b/core/src/main/scala/org/apache/spark/executor/ExecutorUncaughtExceptionHandler.scala index b0e984c03964c..6de9778d6ca4a 100644 --- a/core/src/main/scala/org/apache/spark/executor/ExecutorUncaughtExceptionHandler.scala +++ b/core/src/main/scala/org/apache/spark/executor/ExecutorUncaughtExceptionHandler.scala @@ -17,7 +17,7 @@ package org.apache.spark.executor -import org.apache.spark.Logging +import org.apache.spark.{Logging, SparkInternalExitCode} import org.apache.spark.util.Utils /** @@ -36,14 +36,14 @@ private[spark] object ExecutorUncaughtExceptionHandler // (If we do, we will deadlock.) if (!Utils.inShutdown()) { if (exception.isInstanceOf[OutOfMemoryError]) { - System.exit(ExecutorExitCode.OOM) + System.exit(SparkInternalExitCode.OOM) } else { - System.exit(ExecutorExitCode.UNCAUGHT_EXCEPTION) + System.exit(SparkInternalExitCode.UNCAUGHT_EXCEPTION) } } } catch { - case oom: OutOfMemoryError => Runtime.getRuntime.halt(ExecutorExitCode.OOM) - case t: Throwable => Runtime.getRuntime.halt(ExecutorExitCode.UNCAUGHT_EXCEPTION_TWICE) + case oom: OutOfMemoryError => Runtime.getRuntime.halt(SparkInternalExitCode.OOM) + case t: Throwable => Runtime.getRuntime.halt(SparkInternalExitCode.UNCAUGHT_EXCEPTION_TWICE) } } diff --git a/core/src/main/scala/org/apache/spark/scheduler/ExecutorLossReason.scala b/core/src/main/scala/org/apache/spark/scheduler/ExecutorLossReason.scala index 2bc43a9186449..940704c297155 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/ExecutorLossReason.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/ExecutorLossReason.scala @@ -17,7 +17,7 @@ package org.apache.spark.scheduler -import org.apache.spark.executor.ExecutorExitCode +import org.apache.spark.SparkInternalExitCode /** * Represents an explanation for a executor or whole slave failing or exiting. @@ -29,7 +29,7 @@ class ExecutorLossReason(val message: String) { private[spark] case class ExecutorExited(val exitCode: Int) - extends ExecutorLossReason(ExecutorExitCode.explainExitCode(exitCode)) { + extends ExecutorLossReason(SparkInternalExitCode.explainExitCode(exitCode)) { } private[spark] diff --git a/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala b/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala index 673fc19c060a4..965e480914d01 100644 --- a/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala +++ b/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala @@ -21,8 +21,7 @@ import java.io.File import java.text.SimpleDateFormat import java.util.{Date, Random, UUID} -import org.apache.spark.Logging -import org.apache.spark.executor.ExecutorExitCode +import org.apache.spark.{Logging, SparkInternalExitCode} import org.apache.spark.network.netty.{PathResolver, ShuffleSender} import org.apache.spark.util.Utils @@ -46,7 +45,7 @@ private[spark] class DiskBlockManager(shuffleManager: ShuffleBlockManager, rootD private val localDirs: Array[File] = createLocalDirs() if (localDirs.isEmpty) { logError("Failed to create any local dir.") - System.exit(ExecutorExitCode.DISK_STORE_FAILED_TO_CREATE_DIR) + System.exit(SparkInternalExitCode.DISK_STORE_FAILED_TO_CREATE_DIR) } private val subDirs = Array.fill(localDirs.length)(new Array[File](subDirsPerLocalDir)) private var shuffleSender : ShuffleSender = null diff --git a/core/src/main/scala/org/apache/spark/storage/TachyonBlockManager.scala b/core/src/main/scala/org/apache/spark/storage/TachyonBlockManager.scala index a6cbe3aa440ff..8b53ef14bcc3f 100644 --- a/core/src/main/scala/org/apache/spark/storage/TachyonBlockManager.scala +++ b/core/src/main/scala/org/apache/spark/storage/TachyonBlockManager.scala @@ -23,8 +23,7 @@ import java.util.{Date, Random} import tachyon.client.TachyonFS import tachyon.client.TachyonFile -import org.apache.spark.Logging -import org.apache.spark.executor.ExecutorExitCode +import org.apache.spark.{Logging, SparkInternalExitCode} import org.apache.spark.util.Utils @@ -44,7 +43,7 @@ private[spark] class TachyonBlockManager( if (client == null) { logError("Failed to connect to the Tachyon as the master address is not configured") - System.exit(ExecutorExitCode.TACHYON_STORE_FAILED_TO_INITIALIZE) + System.exit(SparkInternalExitCode.TACHYON_STORE_FAILED_TO_INITIALIZE) } private val MAX_DIR_CREATION_ATTEMPTS = 10 @@ -126,7 +125,7 @@ private[spark] class TachyonBlockManager( if (!foundLocalDir) { logError("Failed " + MAX_DIR_CREATION_ATTEMPTS + " attempts to create tachyon dir in " + rootDir) - System.exit(ExecutorExitCode.TACHYON_STORE_FAILED_TO_CREATE_DIR) + System.exit(SparkInternalExitCode.TACHYON_STORE_FAILED_TO_CREATE_DIR) } logInfo("Created tachyon directory at " + tachyonDir) tachyonDir