Skip to content
Snippets Groups Projects
Commit b054d3b2 authored by Charles Reiss's avatar Charles Reiss
Browse files

ExecutorLostReason -> ExecutorLossReason

parent 24d7aa2d
No related branches found
No related tags found
No related merge requests found
...@@ -249,7 +249,7 @@ private[spark] class ClusterScheduler(val sc: SparkContext) ...@@ -249,7 +249,7 @@ private[spark] class ClusterScheduler(val sc: SparkContext)
} }
} }
def slaveLost(slaveId: String, reason: ExecutorLostReason) { def slaveLost(slaveId: String, reason: ExecutorLossReason) {
var failedHost: Option[String] = None var failedHost: Option[String] = None
synchronized { synchronized {
val host = slaveIdToHost(slaveId) val host = slaveIdToHost(slaveId)
......
...@@ -6,16 +6,16 @@ import spark.executor.ExecutorExitCode ...@@ -6,16 +6,16 @@ import spark.executor.ExecutorExitCode
* Represents an explanation for a executor or whole slave failing or exiting. * Represents an explanation for a executor or whole slave failing or exiting.
*/ */
private[spark] private[spark]
class ExecutorLostReason(val message: String) { class ExecutorLossReason(val message: String) {
override def toString: String = message override def toString: String = message
} }
private[spark] private[spark]
case class ExecutorExited(val exitCode: Int) case class ExecutorExited(val exitCode: Int)
extends ExecutorLostReason(ExecutorExitCode.explainExitCode(exitCode)) { extends ExecutorLossReason(ExecutorExitCode.explainExitCode(exitCode)) {
} }
private[spark] private[spark]
case class SlaveLost(_message: String = "Slave lost") case class SlaveLost(_message: String = "Slave lost")
extends ExecutorLostReason(_message) { extends ExecutorLossReason(_message) {
} }
...@@ -72,7 +72,7 @@ private[spark] class SparkDeploySchedulerBackend( ...@@ -72,7 +72,7 @@ private[spark] class SparkDeploySchedulerBackend(
} }
def executorRemoved(id: String, message: String) { def executorRemoved(id: String, message: String) {
var reason: ExecutorLostReason = SlaveLost(message) var reason: ExecutorLossReason = SlaveLost(message)
if (message.startsWith("Command exited with code ")) { if (message.startsWith("Command exited with code ")) {
try { try {
reason = ExecutorExited(message.substring("Command exited with code ".length).toInt) reason = ExecutorExited(message.substring("Command exited with code ".length).toInt)
......
...@@ -267,7 +267,7 @@ private[spark] class MesosSchedulerBackend( ...@@ -267,7 +267,7 @@ private[spark] class MesosSchedulerBackend(
override def frameworkMessage(d: SchedulerDriver, e: ExecutorID, s: SlaveID, b: Array[Byte]) {} override def frameworkMessage(d: SchedulerDriver, e: ExecutorID, s: SlaveID, b: Array[Byte]) {}
private def recordSlaveLost(d: SchedulerDriver, slaveId: SlaveID, reason: ExecutorLostReason) { private def recordSlaveLost(d: SchedulerDriver, slaveId: SlaveID, reason: ExecutorLossReason) {
logInfo("Mesos slave lost: " + slaveId.getValue) logInfo("Mesos slave lost: " + slaveId.getValue)
synchronized { synchronized {
slaveIdsWithExecutors -= slaveId.getValue slaveIdsWithExecutors -= slaveId.getValue
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment