From b054d3b222e34792dbc9e40f14b4c04043b892e3 Mon Sep 17 00:00:00 2001
From: Charles Reiss <charles@eecs.berkeley.edu>
Date: Thu, 13 Dec 2012 18:44:07 -0800
Subject: [PATCH] ExecutorLostReason -> ExecutorLossReason
---
.../scala/spark/scheduler/cluster/ClusterScheduler.scala | 2 +-
.../{ExecutorLostReason.scala => ExecutorLossReason.scala} | 6 +++---
.../scheduler/cluster/SparkDeploySchedulerBackend.scala | 2 +-
.../scala/spark/scheduler/mesos/MesosSchedulerBackend.scala | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
rename core/src/main/scala/spark/scheduler/cluster/{ExecutorLostReason.scala => ExecutorLossReason.scala} (70%)
diff --git a/core/src/main/scala/spark/scheduler/cluster/ClusterScheduler.scala b/core/src/main/scala/spark/scheduler/cluster/ClusterScheduler.scala
index ab200decb1..20f6e65020 100644
--- a/core/src/main/scala/spark/scheduler/cluster/ClusterScheduler.scala
+++ b/core/src/main/scala/spark/scheduler/cluster/ClusterScheduler.scala
@@ -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
synchronized {
val host = slaveIdToHost(slaveId)
diff --git a/core/src/main/scala/spark/scheduler/cluster/ExecutorLostReason.scala b/core/src/main/scala/spark/scheduler/cluster/ExecutorLossReason.scala
similarity index 70%
rename from core/src/main/scala/spark/scheduler/cluster/ExecutorLostReason.scala
rename to core/src/main/scala/spark/scheduler/cluster/ExecutorLossReason.scala
index 8976b3969d..bba7de6a65 100644
--- a/core/src/main/scala/spark/scheduler/cluster/ExecutorLostReason.scala
+++ b/core/src/main/scala/spark/scheduler/cluster/ExecutorLossReason.scala
@@ -6,16 +6,16 @@ import spark.executor.ExecutorExitCode
* Represents an explanation for a executor or whole slave failing or exiting.
*/
private[spark]
-class ExecutorLostReason(val message: String) {
+class ExecutorLossReason(val message: String) {
override def toString: String = message
}
private[spark]
case class ExecutorExited(val exitCode: Int)
- extends ExecutorLostReason(ExecutorExitCode.explainExitCode(exitCode)) {
+ extends ExecutorLossReason(ExecutorExitCode.explainExitCode(exitCode)) {
}
private[spark]
case class SlaveLost(_message: String = "Slave lost")
- extends ExecutorLostReason(_message) {
+ extends ExecutorLossReason(_message) {
}
diff --git a/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala b/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
index f505628753..efaf2d330c 100644
--- a/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
+++ b/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
@@ -72,7 +72,7 @@ private[spark] class SparkDeploySchedulerBackend(
}
def executorRemoved(id: String, message: String) {
- var reason: ExecutorLostReason = SlaveLost(message)
+ var reason: ExecutorLossReason = SlaveLost(message)
if (message.startsWith("Command exited with code ")) {
try {
reason = ExecutorExited(message.substring("Command exited with code ".length).toInt)
diff --git a/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala b/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
index b0d4315f05..8c7a1dfbc0 100644
--- a/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
+++ b/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
@@ -267,7 +267,7 @@ private[spark] class MesosSchedulerBackend(
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)
synchronized {
slaveIdsWithExecutors -= slaveId.getValue
--
GitLab