Skip to content

Commit f595bd6

Browse files
committed
recover some unintentional changes
1 parent 63b3df9 commit f595bd6

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ private[deploy] class ApplicationInfo(
7575
}
7676
}
7777

78-
def addExecutor(worker: WorkerInfo, cores: Int, useID: Option[Int] = None): ExecutorDesc = {
78+
private[master] def addExecutor(worker: WorkerInfo, cores: Int, useID: Option[Int] = None):
79+
ExecutorDesc = {
7980
val exec = new ExecutorDesc(newExecutorId(useID), this, worker, cores, desc.memoryPerExecutorMB)
8081
executors(exec.id) = exec
8182
coresGranted += cores

core/src/main/scala/org/apache/spark/deploy/master/Master.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import java.net.URLEncoder
2222
import java.text.SimpleDateFormat
2323
import java.util.Date
2424

25-
import scala.collection.mutable.{ListBuffer, ArrayBuffer, HashMap, HashSet}
25+
import scala.collection.mutable.{ArrayBuffer, HashMap, HashSet}
2626
import scala.concurrent.Await
2727
import scala.concurrent.duration._
2828
import scala.language.postfixOps

0 commit comments

Comments
 (0)